small changes
Merge branch 'workshop1' of https://github.com/winktechnologies/angularjs-workshops into workshop1

Conflicts:
	public/css/app/main.css