first commit
Homework 7/30/14
committing a bunch of changes
added stuff
changed folder name
commit to group
Merge branch 'master' of https://github.com/theironyard-rails-atl/Taylor-Martin

Conflicts:
	.DS_Store