Using some stuff from the angular js framework
Merge branch 'master' of https://github.com/sunniejai/black-sesame

Conflicts:
	index.html