new commit
Merge branch 'master' of https://github.com/talkingstick/repo
monday clean up
Merge branch 'master' of https://github.com/talkingstick/repo
Merge pull request #1 from shadikabajah/master

merge
Updating Instructions Copy on Modal
Updating Instructions Copy on Modal #2
Updating Instructions Copy on Modal #3
Updating Instructions Copy on Modal #4

Fixing typos and spacing
styling the intro screen
fixed merge error
fixed merge error
Merge pull request #2 from shadikabajah/master

ui-radio
aligning mode buttons on input screen
styling instructions screen
mode_button_fix_jQuerymobile
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html
Merge pull request #1 from talkingstick/master

button_jquerymobile