options initial commit
second commit
stuff
Merge branch 'master' into options
Merge branch 'master' into options
seeded some stuff and added options to questions
Merge pull request #24 from oconn/options

Optionsasd