commit before merging the timer fix
commit before merging

Signed-off-by: Nathan Vasquez <nathan.superartie@gmail.com>
Merge branch 'master' of https://github.com/DSRoden/roundup
updated enemies and platforms to fixed positions
updated enemies and platforms to fixed positions
Merge branch 'nathan'