FInal commit
Merge branch 'master' of https://github.com/petertait/moments

Conflicts:
	src/css/styles.css