this is a message
Merge branch 'master' of https://github.com/rramsaro/froggr
update
Merge branch 'master' of https://github.com/rramsaro/froggr
add lane class
Merge branch 'master' of https://github.com/rramsaro/froggr

Conflicts:
	src/sprites/Platform.java
updated froggr game class