Initial commit
Merge remote-tracking branch 'TIMER/master'

Conflicts:
	.gitignore
Merge branch 'master' into develop