checkboxes n addin
Because
Merge branch 'master' of https://github.com/austintrose/hackathon-project

Conflicts:
	templates/js/main.js
weeee