small edits to level 2 xml
Merge commit '57ab17ae30eaf837ed4caabec577c26a7e813110' into dylan
adding beats to seconds in obstacle gen and model
game event bools
Merge branch 'maxAudio' of https://github.com/aefreedman/Field1 into maxAudio

Conflicts:
	src/GameEvent.h
fixed semantic er in obsgen
added ability to spin blocks. added level 3 xml, took out some logs. hello mother.
Merge commit 'de9d304c8e78e67cb037286f0c7ca9e3b9ebe599' into dylan

Conflicts:
	src/Model.cpp

maxim and dylan's copies synched up and merged correctly.
added level three, set audio default playing, made some changes in square generator to allow spinning
Merge commit '0fd64ee628e610ab7d008fba1e4ef1acd525946d' into dylan

Conflicts:
	src/AudioHandler.cpp
	src/Model.cpp
took all of aaron, none of the conflicts were kept from dylan. one was a log one was something commented out.
slight revisions to game screen text and uncommenting audio handler thing to prevent crashing bug due to merge.
resized goal to 55, set whistle to play by default, commented and uncommented some background audio and PLAYTESTED THIS BITCH.
Merge commit '188fc25c93f14c1c875791c0e5b2c742c362eeb2' into aaron_mac
ITS ORANGE