fixed random stuff, still not up and running
Merge branch 'master' of https://github.com/DonnieWest/TitanDjango