Added Main Angular Functionality
Merge branch 'master' of https://github.com/benjamin-martin987/2509ICT

Conflicts:
	app/views/main.html