validations added
fixed merge confilcts
model tweaks
bootstrap pull
things
Merge branch 'andy' of github.com:JohnJohnsonDampBox/schwagTracker into andy
Devise added
Merge branch 'andy' into development
continue removing simple form