charts
Merge branch 'master' of github.com:Cyber-Duck/floodgate.io

Conflicts:
	client/app/views/projects/project.blade.php
	client/public/css/style.css