add P and R for pause and resume into instructions
Merge remote-tracking branch 'upstream/master'
map collisions now work
delete commented out lines to fix merge conflict
Merge pull request #76 from dabeeya/master

map collisions work with tile map editor
commit file before merging
fixing main.js file in order to merge latest change from master
add about us information with link to github repository
Merge pull request #77 from juljun14/master

Add about us page
fix merge conflict