Pulled from development and added test framework
Merge branch 'development' of github.com:JohnJohnsonDampBox/schwagTracker into ramin
Merge remote-tracking branch 'origin/andy' into ramin
add centering to Product form
prepare for pre manual form pull
Merge branch 'andy' of github.com:JohnJohnsonDampBox/schwagTracker into andy
Merge branch 'andy' into development
Merge branch 'andy' into development
fixed test database
Merge pull request #2 from JohnJohnsonDampBox/andy

Andy
add forms and basic bootstrap outlines
style out forms
fixed test database
continue removing simple form
Merge branch 'development' of github.com:JohnJohnsonDampBox/schwagTracker into development

To get the js on evelopment
fixed merge conflicts
Added tests to products and orders
Added tests to orders, products, fixtures for products and orders
commited
product params fixed