Merge pull request #8 from dlawre14/master

Sprint 2 updates and .gitignore fixes
Media Player
Merge pull request #11 from dlawre14/master

STT Pull Request
Media Player
Merge branch 'master' into sprint_2

Conflicts:
	NoteTaker/src/main/AndroidManifest.xml
	NoteTaker/src/main/res/layout/activity_main.xml