tp
Merge branch 'master' of https://github.com/jtsanch/music_app
merging w travis
mergefix
implemeneted timeline/markee and video controls, added dummy button for saving, and implemented turning critiquer audio off during performance (still need to test). Also fixed UI of invite modal. Removed main.css so we need to check if anything important was on main.css that we need to move to style.css
implemeneted timeline and video controls, added dummy button for saving, and implemented turning critiquer audio off during performance (still need to test). Also fixed UI of invite modal. Removed main.css so we need to check if anything important was on main.css that we need to move to style.css