lk,
Merge branch 'master' of https://github.com/AVatch/Google-24-Hr-Hackathon

Conflicts:
	Django_Project/LinkSweeper/static/js/link-gen.js