Fixing live reload
WIP: getting angular not busted
Merge branch 'master' of https://github.com/mvanasse/peril

Conflicts:
	phone/src/less/main.less
Merge branch 'master' of https://github.com/mvanasse/peril

Conflicts:
	phone/src/less/main.less