Finished connecting choices Yay

All that is left is to comment and fix the back button bug
Merge branch 'master' of https://github.com/Tyler-Meen/CMPUT301F13T10