Renamed & upgraded

Moved project to Python 3.4 and Django 1.6.5

Renamed solution/project so Django would build properly
fuck off Github I resolved the merge conflict

Fuck you git just take it, I'm going in dry
asfd

qwert