Added compiletime.h to .gitignore
Merge branch 'master' of https://github.com/jamesfowkes/UNIXClock

Conflicts:
	makefile