Safe new colors. #COLORDANGER
Merge branch 'master' of https://github.com/Senior-Project-2013/Worphles

Conflicts:
	client/js/particles.js