accidentally committed to master - resetting my commits to this branch
oops. re-adding readme file. sorry.
Added solutions
Merge branch 'master' of github.com:portlandcodeschool/jse-fall14-7 into stacyFabian
Updates to gui based on solutions and combining them to my implementation