models created
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
Pulled from development and added test framework
add forms and basic bootstrap outlines
model tweaks
Merge branch 'development' of github.com:JohnJohnsonDampBox/schwagTracker into ramin
bootstrap pull
style out forms
things
Merge branch 'andy' of github.com:JohnJohnsonDampBox/schwagTracker into andy
Merge remote-tracking branch 'origin/andy' into ramin
Devise added
add centering to Product form
prepare for pre manual form pull