Merge branch 'master' of github.com:CodeClub/lesson_format
Removed timestamps from generated CSS
Merge branch 'master' of github.com:CodeClub/lesson_format

Conflicts:
	assets/css/master.min.css