All my stuff
Updated back to what i had
Got summary to work
Merge branch 'neel'

Conflicts:
	css/custom.css
	index.html
	js/input.js
	js/main.js