did stuff at home
Merge branch 'master' of github.com:marcusjbishop/104
Merge branch 'master' of github.com:marcusjbishop/104
fixed two things