breaking and fixing things
Merge branch 'master' of https://github.com/therewasaguy/ccrex

Conflicts:
	index.php