add Gemfile specs
Merge branch 'craig' into development
prep for bootstrap
scaffold_controllers added
Merge branch 'development' of github.com:JohnJohnsonDampBox/schwagTracker into development
add welcome framework and cleanup controllers
validations added
fixed merge confilcts
add forms and basic bootstrap outlines
model tweaks
bootstrap pull
style out forms
things
Merge branch 'andy' of github.com:JohnJohnsonDampBox/schwagTracker into andy
Devise added
halfway through js, with devise, remote git is fucked