Merge pull request #2 from bstamp/assignment

Assignment completion
change routes and close title tag
Merge pull request #7 from cclaiborne/master

change routes and close title tag
Merge branch 'dev' of https://github.com/bstamp/portfolio into master

Conflicts:
	config/routes.rb