everything done except upload functionality
cleanup
updated images
buttons and seekbar
Merge branch 'master' into steven
Merge branch 'steven' of github.com:stuycs-softdev/inSync into steven
Merge branch 'steven' of github.com:stuycs-softdev/inSync into steven