CHanging colours/Fonts
Merge branch 'master' of https://github.com/stefanol/NFFTT

Conflicts:
	styles/less/main.less
	styles/main.css