adding stuff (dont knwo what it was)
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/simpletasker/ui/CodePane.java
Merge branch 'master' of github.com:SimpleTasker/SimpleTasker