Playing around with stuff
Merge branch 'master' of https://github.com/stefanol/NFFTT

Conflicts:
	styles/less/main.less