Merge pull request #12 from 2011dkang1/jason_addToqApi

Added Toq API
splash_screen
Merge pull request #13 from 2011dkang1/alvin_splash

splash_screen
tuner
Added toq functionality to main activity

Note: There Is an Issue currently with the way the timeout is
implemented, makes it so it is impossible to end session, currently
working on fixing
Merge pull request #14 from 2011dkang1/alvin_tuner

tuner
updated chords to be from state of grace
Merge pull request #15 from 2011dkang1/jason_addSongSpinner

Jason misc tasks.
Fixed end session bug
Merge branch 'master' into sarah_toq

Conflicts:

Chordstars/app/src/main/java/guitarheroes/com/chordstar/MainActivity.jav
a
Set Screen Orientation to portrait
Merge branch 'sarah_toq'
Next Next
fixed merge conflicts