Added audio controls to the moudels
Merge branch 'gh-pages' of https://github.com/PHIConflictAssignment/Conflict into gh-pages

Conflicts:
	css/app.css
	index.html