?
Merge branch 'Leora' of https://github.com/CSULA-CS/AngularJS-Practice-GuestBook into Leora

Conflicts:
	app/index.html
	app/js/controllers.js
?
Merge branch 'Leora' of https://github.com/CSULA-CS/AngularJS-Practice-GuestBook into Leora