joe is cute
Merge branch 'master' of https://github.com/AVatch/Google-24-Hr-Hackathon

Conflicts:
	Not_Django_Project/static/js/linksweeper.js
Merge branch 'master' of https://github.com/AVatch/Google-24-Hr-Hackathon