navbar included through angular directive
Merge branch 'master' of https://github.com/mframp/Animation-Project-Manager

Conflicts:
	views/createUser.html
	views/index.html
	views/shotInfo.html
	views/tasks.html