Moving files around
Merge branch 'master' into bootstrap-jquery-ui
Added bootstrap jquery ui, separated controls from network player
Merge branch 'master' of github.com:jmcomets/IntoSpectrum