validations added
fixed merge confilcts
model tweaks
bootstrap pull
things
Merge branch 'andy' of github.com:JohnJohnsonDampBox/schwagTracker into andy
Devise added
prepare for pre manual form pull
Merge branch 'andy' of github.com:JohnJohnsonDampBox/schwagTracker into andy
Merge branch 'andy' into development
halfway through js, with devise, remote git is fucked
js working but ugly
Merge branch 'development' of github.com:JohnJohnsonDampBox/schwagTracker into development

To get the js on evelopment
fixed merge conflicts