it's daaaaanglin
resolving conflicts
final fixes to merge conflicts
Merge branch 'master' of https://github.com/Fittr/fittr into stylin

Conflicts:
	public/templates/topBar.html
Merge pull request #102 from sudostack/stylin

Stylin - it's daaaaaaanglin'