added functionality to transfer data between states using the Options class
Merge branch 'master' of https://github.com/guts2014/Geeksoc
Options stuff