not sure what happened actually, oops
fixed merge conflicts
final design changes
Merge pull request #19 from gopher-snakes-2013/finaldesignchanges

Finaldesignchanges