added .gitignore
Merge branch 'gh-pages' of https://github.com/killfall/asteroid-prospector
adding bootstrap and gamestate javascript
Merge branch 'gh-pages' of https://github.com/killfall/asteroid-prospector
Merge branch 'gh-pages' of https://github.com/killfall/asteroid-prospector
Merge pull request #12 from CountOlaf/gh-pages

Added pickup icons
adding the game state
Merge branch 'gh-pages' of https://github.com/killfall/asteroid-prospector
Merge pull request #13 from kris-sum/master

Added game state
Merge pull request #14 from kris-sum/master

Added game state
Started implementing drops
30 fps, not 10...
Merge branch 'gh-pages' of github.com:killfall/asteroid-prospector into gh-pages

Conflicts:
	js/main.js
added mainbase
solving conflict
reducing mass of base
Added space station
changing the timestep back to the proper one
Merge pull request #18 from CountOlaf/master

Added space station
Merge pull request #17 from CountOlaf/master

Added space station