GA page working and preview mode on
Merge branch 'prod' of https://github.com/stevepofd/yolo-octo-archer into prod

Conflicts:
	assets/css/main.css
	assets/js/main.js
Merge branch 'prod' of github.com:stevepofd/yolo-octo-archer into prod
changed default to server