Slight changes to make a different drum beat sound, constant tempo
Merge branch 'master' of github.com:mwein/RunningApp

Conflicts:
	PaceBeat/bin/classes.dex
	PaceBeat/src/edu/msu/weinmatt/pacebeat/PaceBeat.java
	PaceBeat/src/edu/msu/weinmatt/pacebeat/PaceBeatActivity.java
Merge branch 'master' of github.com:mwein/RunningApp

Conflicts:
	PaceBeat/bin/PaceBeat.apk
	PaceBeat/bin/classes.dex
	PaceBeat/src/edu/msu/weinmatt/pacebeat/PaceBeat.java
Merge branch 'master' of github.com:mwein/RunningApp

Conflicts:
	PaceBeat/bin/classes.dex
	PaceBeat/bin/resources.ap_
	PaceBeat/src/edu/msu/weinmatt/pacebeat/PaceBeat.java
Added git ignore file