Stuff.
Merge branch 'master' of https://github.com/toshle/TimeWaste

Conflicts:
	TimeWaste/src/com/timewaste/timewaste/Categories.java