Merge pull request #1 from mis8680/master

HAH! GAYYYYY@@@
updated reame
Merge branch 'master' of github.com:jeremymills/feb14-gitworkflow
new commit
Merge pull request #8 from jeremymills/master

dfsg