merging my FroggrGame with master
test
updated button images, also refactored instructions, and set up credits pop up
trying to get merged
Merge branch 'master' of https://github.com/rramsaro/froggr
test
test
Merge branch 'master' of https://github.com/rramsaro/froggr
Merge branch 'master' of https://github.com/rramsaro/froggr.git
Moved res folder to /bin
Added main menu buttons
Merge branch 'master' of https://github.com/rramsaro/froggr.git
test change
"sound test"
I created the SoundEffect class and deleted the old SoundPlayer class. I
refactored the generateVehicle and generatePlatform methods so each
vehicle and platform can be generated dynamically based on its own
regeneration rate. To do this I made getVehicleTime, getPlatformTime,
resetVehicleTime, and resetPlatformTime methods. I also several needed
comments and author comments to all of our classes.
Refactored lane regeneration methods.
.classpath and .project files
Merge branch 'refactored-lanes'
Merge branch 'master' into animation

Conflicts:
	src/game/FroggrGame.java
	src/sprites/Platform.java
	src/sprites/Player.java
	src/sprites/Vehicle.java