temp
Merge branch 'master' of https://github.com/phonpr/cs414-mps

Conflicts:
	Mp1/src/org/cs414/mp1/controllers/RecordController.java
Merge branch 'master' of https://github.com/phonpr/cs414-mps
connected audio samplerate interface