added .gitignore
Merge branch 'gh-pages' of https://github.com/killfall/asteroid-prospector
Added multiple asteroid types
Merge branch 'gh-pages' of github.com:killfall/asteroid-prospector into gh-pages
Implemented new images
adding bootstrap and gamestate javascript
Modified number and spawn locations of asteroids
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 #11 from GaryLipscombe/gh-pages

New index page
Added pickup icons
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