Updated more stuff
Merge branch 'master' of https://github.com/hilts-vaughan/railgun
Updated questions