First cut of rename so we can inch towards doing this properly
Merge branch 'master' of https://github.com/fir3pho3nixx/cryo-web

Conflicts:
	.gitignore