may haave messed up /musicsoftware based ttr
finally got sound woking again
before i integrate
search page changes and much more
more moving arrows
beat work
Merge branch 'master' of https://github.com/usrfrndly/TapTapREVOLUTION

Conflicts:
	.idea/.name
	.idea/TTR.iml
	.idea/codeStyleSettings.xml
	.idea/dataSources.ids
	.idea/dataSources.xml
	.idea/dictionaries/jaclyn.xml
	.idea/encodings.xml
	.idea/inspectionProfiles/Project_Default.xml
	.idea/inspectionProfiles/profiles_settings.xml
	.idea/jsLibraryMappings.xml
	.idea/jsLinters/jshint.xml
	.idea/jsLinters/jslint.xml
	.idea/libraries/jquery_latest.xml
	.idea/misc.xml
	.idea/modules.xml
	.idea/scopes/scope_settings.xml
	.idea/vagrant.xml
	.idea/vcs.xml
	.idea/workspace.xml
	.metadata/.lock
	.metadata/.log
	.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version
	.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version
	.metadata/.plugins/org.eclipse.core.resources/.root/1.tree
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.runtime/.settings/ccw.core.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/com.adobe.flexide.as.core.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/com.adobe.flexide.css.core.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/com.adobe.flexide.mxml.core.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/com.brainwy.liclipse.editor.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/com.brainwy.liclipse.theme.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/com.dubture.twig.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/com.github.eclipsecolortheme.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/com.palantir.typescript.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/com.powerflasher.fdt.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/com.puppetlabs.geppetto.module.dsl.Module.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/com.puppetlabs.geppetto.pp.dsl.PP.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/com.spket.js.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/com.spket.xml.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/de.walware.statet.base.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/de.walware.statet.r.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/eclihx.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/goclipse.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/jp.gr.java_conf.ussiy.app.propedit.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/jsonedit-core.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/net.sf.eclipsefp.haskell.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/net.sourceforge.texlipse.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/net.vtst.ow.eclipse.less.Less.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.cfeclipse.cfml.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.chromium.debug.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.cloudsmith.geppetto.pp.dsl.PP.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.codehaus.groovy.eclipse.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.dadacoalition.yedit.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.angularjs.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ant.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.cdt.make.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.cdt.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.variables.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.datatools.sqltools.sqleditor.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.dltk.ruby.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.dltk.tcl.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.e4.CSS.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.e4.ui.css.swt.theme.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jst.jsp.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.pde.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.php.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.team.cvs.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.team.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.css.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.dtd.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.html.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.jsdt.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.xml.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.xsl.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.xtend.core.Xtend.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.epic.perleditor.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.erlide.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.jboss.ide.eclipse.freemarker.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.nodeclipse.enide.editors.gradle.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.nodeclipse.enide.editors.jade.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.python.pydev.debug.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.python.pydev.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.scala-ide.play2.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.scala-ide.sdt.core.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.sourceforge.jsonedit.core.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.sweetlemonade.eclipse.json.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/winterwell.markdown.prefs
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.workbench.texteditor/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
	.metadata/version.ini
	.project
	.pydevproject
	TTR/__init__.py
	TTR/__init__.pyc
	TTR/settings.py
	TTR/settings.pyc
	TTR/urls.py
	TTR/urls.pyc
	TTR/wsgi.py
	TTR/wsgi.pyc
	db.sqlite3
	game/__init__.py
	game/__init__.pyc
	game/admin.py
	game/admin.pyc
	game/migrations/0001_initial.py
	game/migrations/0001_initial.pyc
	game/migrations/__init__.py
	game/migrations/__init__.pyc
	game/models.py
	game/models.pyc
	game/tests.py
	game/tests.pyc
	game/urls.py
	game/urls.pyc
	game/views.py
	game/views.pyc
Finally moving!!