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
Merge commit 'de9d304c8e78e67cb037286f0c7ca9e3b9ebe599' into dylan

Conflicts:
	src/Model.cpp

maxim and dylan's copies synched up and merged correctly.