changes
Merge branch 'master' of https://github.com/drstearns/team-dev-demo

Conflicts:
	css/styles.css
resolved merge conflict