Toby@DESKTOP /c/Projects/Bukkit-Spigot Plugins/ProjectKorra/src/com/projectkorra
/projectkorra (master)
$ git log --pretty
commit df622388ab9d1814c33111f823c96831d0aec7e8
Merge: 75988ec a1288b4
Author: StrangeOne101 <strange.toby@gmail.com>
Date:   Tue Aug 18 16:57:47 2015 +1200

    Merge remote-tracking branch 'ProjectKorra/master'

    Conflicts:
        src/com/projectkorra/projectkorra/GeneralMethods.java

commit 75988ecc56254ca0447b65c59741edf8d650500d
Author: StrangeOne101 <strange.toby@gmail.com>
Date:   Tue Aug 18 13:29:40 2015 +1200

    Revamp Elements and SubElements

    Elements and SubElements are now somewhat integrated so you can relate betwe

    Should make things much easier when comparing the two.

commit 70bfbfeea732f3da9272321826840b356b244cf8
Author: StrangeOne101 <strange.toby@gmail.com>
Date:   Tue Aug 18 11:54:03 2015 +1200

: