partials
Merge branch 'master' of github.com:abramhindle/CMPUT404-Angular

Conflicts:
	WWW
	app/partials/example.html
tuple example
more angular
more angular