Almost there!
Merge branch 'protosc' of https://github.com/ShellMakr/Capstone into protosc

Conflicts:
	MyShuttle/app/controllers/Application.scala
	MyShuttle/logs/application.log
	MyShuttle/project/target/resolution-cache/default/myshuttle-build/scala_2.10/sbt_0.13/0.1-SNAPSHOT/resolved.xml.properties
	MyShuttle/project/target/resolution-cache/default/myshuttle-build/scala_2.10/sbt_0.13/0.1-SNAPSHOT/resolved.xml.xml
	MyShuttle/project/target/resolution-cache/reports/default-myshuttle-build-compile-internal.xml
	MyShuttle/project/target/resolution-cache/reports/default-myshuttle-build-compile.xml
	MyShuttle/project/target/resolution-cache/reports/default-myshuttle-build-docs.xml
	MyShuttle/project/target/resolution-cache/reports/default-myshuttle-build-optional.xml
	MyShuttle/project/target/resolution-cache/reports/default-myshuttle-build-plugin.xml
	MyShuttle/project/target/resolution-cache/reports/default-myshuttle-build-pom.xml
	MyShuttle/project/target/resolution-cache/reports/default-myshuttle-build-provided.xml
	MyShuttle/project/target/resolution-cache/reports/default-myshuttle-build-runtime-internal.xml
	MyShuttle/project/target/resolution-cache/reports/default-myshuttle-build-runtime.xml
	MyShuttle/project/target/resolution-cache/reports/default-myshuttle-build-scala-tool.xml
	MyShuttle/project/target/resolution-cache/reports/default-myshuttle-build-sources.xml
	MyShuttle/project/target/resolution-cache/reports/default-myshuttle-build-test-internal.xml
	MyShuttle/project/target/resolution-cache/reports/default-myshuttle-build-test.xml
	MyShuttle/project/target/streams/$global/update/$global/streams/out
	MyShuttle/project/target/streams/$global/update/$global/streams/output
	MyShuttle/target/resolution-cache/mushuttle/mushuttle_2.11/1.0-SNAPSHOT/resolved.xml.properties
	MyShuttle/target/resolution-cache/mushuttle/mushuttle_2.11/1.0-SNAPSHOT/resolved.xml.xml
	MyShuttle/target/resolution-cache/reports/mushuttle-mushuttle_2.11-compile-internal.xml
	MyShuttle/target/resolution-cache/reports/mushuttle-mushuttle_2.11-compile.xml
	MyShuttle/target/resolution-cache/reports/mushuttle-mushuttle_2.11-docs.xml
	MyShuttle/target/resolution-cache/reports/mushuttle-mushuttle_2.11-echo-sigar.xml
	MyShuttle/target/resolution-cache/reports/mushuttle-mushuttle_2.11-echo-trace-compile.xml
	MyShuttle/target/resolution-cache/reports/mushuttle-mushuttle_2.11-echo-trace-test.xml
	MyShuttle/target/resolution-cache/reports/mushuttle-mushuttle_2.11-echo-weave.xml
	MyShuttle/target/resolution-cache/reports/mushuttle-mushuttle_2.11-optional.xml
	MyShuttle/target/resolution-cache/reports/mushuttle-mushuttle_2.11-plugin.xml
	MyShuttle/target/resolution-cache/reports/mushuttle-mushuttle_2.11-pom.xml
	MyShuttle/target/resolution-cache/reports/mushuttle-mushuttle_2.11-provided.xml
	MyShuttle/target/resolution-cache/reports/mushuttle-mushuttle_2.11-runtime-internal.xml
	MyShuttle/target/resolution-cache/reports/mushuttle-mushuttle_2.11-runtime.xml
	MyShuttle/target/resolution-cache/reports/mushuttle-mushuttle_2.11-scala-tool.xml
	MyShuttle/target/resolution-cache/reports/mushuttle-mushuttle_2.11-sources.xml
	MyShuttle/target/resolution-cache/reports/mushuttle-mushuttle_2.11-test-internal.xml
	MyShuttle/target/resolution-cache/reports/mushuttle-mushuttle_2.11-test.xml
	MyShuttle/target/scala-2.11/cache/root/compile/play_instrumentation
	MyShuttle/target/scala-2.11/classes/controllers/Application$$anonfun$index$1$$anonfun$apply$1.class
	MyShuttle/target/scala-2.11/classes/controllers/Application$$anonfun$index$1$$anonfun$controllers$Application$$anonfun$$storevalues$1$1$$anonfun$apply$2.class
	MyShuttle/target/scala-2.11/classes/controllers/Application$$anonfun$index$1$$anonfun$controllers$Application$$anonfun$$storevalues$1$1$$anonfun$apply$3$$anonfun$apply$4$$anonfun$8.class
	MyShuttle/target/scala-2.11/classes/controllers/Application$$anonfun$index$1$$anonfun$controllers$Application$$anonfun$$storevalues$1$1$$anonfun$apply$3$$anonfun$apply$5$$anonfun$apply$6$$anonfun$9.class
	MyShuttle/target/scala-2.11/classes/controllers/Application$$anonfun$index$1$$anonfun$controllers$Application$$anonfun$$storevalues$1$1$$anonfun$apply$3.class
	MyShuttle/target/scala-2.11/classes/controllers/Application$$anonfun$index$1$$anonfun$controllers$Application$$anonfun$$storevalues$1$1.class
	MyShuttle/target/scala-2.11/classes/controllers/Application$$anonfun$index$1$$anonfun$controllers$Application$$anonfun$$storevalues$1$2$$anonfun$apply$2.class
	MyShuttle/target/scala-2.11/classes/controllers/Application$$anonfun$index$1$$anonfun$controllers$Application$$anonfun$$storevalues$1$2$$anonfun$apply$3$$anonfun$apply$4.class
	MyShuttle/target/scala-2.11/classes/controllers/Application$$anonfun$index$1$$anonfun$controllers$Application$$anonfun$$storevalues$1$2$$anonfun$apply$3.class
	MyShuttle/target/scala-2.11/classes/controllers/Application$$anonfun$index$1.class
	MyShuttle/target/scala-2.11/classes/controllers/Application$.class
	MyShuttle/target/scala-2.11/classes/controllers/Application.class
	MyShuttle/target/scala-2.11/src_managed/main/controllers/routes.java
	MyShuttle/target/scala-2.11/src_managed/main/routes_reverseRouting.scala
	MyShuttle/target/scala-2.11/src_managed/main/routes_routing.scala
	MyShuttle/target/scala-2.11/twirl/main/views/html/index.template.scala
	MyShuttle/target/scala-2.11/twirl/main/views/html/main.template.scala
	MyShuttle/target/streams/$global/assets/$global/streams/sync-mappings
	MyShuttle/target/streams/$global/update/$global/streams/output
	MyShuttle/target/streams/compile/compile/$global/streams/export
	MyShuttle/target/streams/compile/copyResources/$global/streams/copy-resources
	MyShuttle/target/streams/compile/incCompileSetup/$global/streams/inc_compile_2.11
why am i getting errors on routes :C