the skeleton
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/TasKoord.java
	src/storage/Storage.java
	src/theUI/UserInterface.java
	src/tkLibrary/CommandType.java
	src/tkLibrary/Constants.java
	src/tkLibrary/FrequencyType.java
	src/tkLibrary/StateType.java
	src/tkLibrary/Task.java
	src/tkLogic/Logic.java
	src/tkLogic/Parser.java