Update to gitignore and MakeFile
Merge branch 'master' of https://github.com/spaceconcordia/space-timer-lib

Conflicts:
	Makefile