modal
Merge branch 'master' of https://github.com/scottk92/chalkwalk

Conflicts:
	views/drawer.html