commit on home computer
Merge branch 'master' of github.com:stephs829/github_yeoman_steph_profile

Conflicts:
	.DS_Store
	app/.DS_Store
	app/index.html
	app/scripts/.DS_Store
	app/styles/main.css
added resume page, trying to deploy to heroku using node