made main loop more readable
Merge branch 'master' of https://github.com/dcates/insanaquarium