Angular bootstrapping
Merge branch 'master' of https://github.com/benbrignell/sally

Conflicts:
	_layouts/home.html