Changes for theaceremix
Merge branch 'master' of https://github.com/daleanthony/Uno

Conflicts:
	partials/side-panel.hbs
	post.hbs
Merge fix
Added google analytics code
Merge branch 'master' of github.com:cntwo/uno