new icons
testing YWP, will probably switch to JW Player
Merge branch 'master' of github.com:stuycs-softdev/inSync
Merge branch 'master' into steven

Conflicts:
	inSync/src/com/example/insync/BluetoothHost.java
socketio proof of it works yay
Merge branch 'master' into steven
added scrollview
Merge branch 'steven' of github.com:stuycs-softdev/inSync into steven

Conflicts:
	inSync/bin/classes.dex
	inSync/bin/inSync.apk
	inSync/bin/resources.ap_
	inSync/src/com/example/insync/BluetoothHost.java
	inSync/src/com/example/insync/MainActivity.java