end file newline
Merge branch 'master' of github.com:samkreter/FreeTime