Initial commit
first commit, project files for step 2 of angular phonecat
Merge branch 'master' of https://github.com/winniequartey/phonecat_repo

Conflicts:
	README.md
Merge branch 'master' of https://github.com/korrkor/tutorial

Conflicts:
	README.md
	app/css/app.css
	app/index.html
	app/js/controllers.js