la till .cproject
Merge branch 'master' of https://github.com/johnhult/TickTock.git
rm .project