work in progress
Merge branch 'master' of https://github.com/mrkelly/up-angular

Conflicts:
	dist/index.html
	src/views/index.jade
Add ci stuff
Merge branch 'master' of https://github.com/mrkelly/up-angular

Conflicts:
	src/views/index.jade