GIT doesnt appear to be reading the game_dev.js file correctly, so you might have to manually merge it on this time.

Updates to:
index.php
game_dev.js

Changes:
Change Start Research to a button
Fix BuyMax on workers to not go over limit
Fix submission to allow submissions if they don't go through before the 5 minutes UNLESS its cheat detected