Retina logo
Merge branch 'master' of https://github.com/Cyber-Duck/floodgate.io

Conflicts:
	client/public/css/style.css