Cantina to do list
Cantina to do list
Merge branch 'master' of github.com:kristas/cantina

Conflicts:
	javascript/.DS_Store