angular day 1 in class
Merge branch 'angular_day1' of https://github.com/codefellows/sea-b24-notes

Conflicts:
	server.js