users controller, there is not much to it, unless im missing something
Merge branch 'master' into marcus
Merge branch 'master' into marcus
removed bug on form, datetime
fixed merge conflict on airplane form
airplanes controller tests working
Merge pull request #22 from MollyMoile/marcus

Great job on the testing, Marcus!