eric look

look!
Update index.html

Tim's update
Update app.js
Merge branch 'master' into Leora

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

Conflicts:
	app/index.html
	app/js/controllers.js
link edit
remove errors add logos
?
Merge branch 'Leora' of https://github.com/CSULA-CS/AngularJS-Practice-GuestBook into Leora
bootstrap designing
Merge remote-tracking branch 'origin/Leora'

Conflicts:
	app/partials/start.html