Finish slicing
finish all slicing
Merge branch 'master' of https://github.com/ndemoor/hackathon
Merge branch 'master' of https://github.com/ndemoor/hackathon

Conflicts:
	app/index.html
Finish polish design