added navtabs (hopefully)
added navtabs (hopefully)
Merge branch 'ron' of https://github.com/blaketmiller/devnull into ron
Merge branch 'master' of https://github.com/blaketmiller/devnull into ron
added better pictures to the order/index.html, also gave descriptions and filled in non-sense text.
Merge branch 'master' of https://github.com/blaketmiller/devnull into ron
new pictures..
Merge branch 'master' of https://github.com/blaketmiller/devnull into Larry
Changes to bootstrap.css
>Reverted bootstrap.css file
>Added a globalOverride file for any and all global changes. Documentation for addition should be included.
>Index style changes
Fixes 0.006a

Fix merges. Showing error after form checking.
>Various style changes.
Merge pull request #12 from blaketmiller/blake

added credit card timer, attr. to Ben Garside
fix 0.006b

Make more code fixes
merging validation conflicts
resolving branch conflicts for validation.php
added help button, changed all non-sense words, added cash conformation page
fix 0.006Final

Fixed code/improvement
Merge pull request #15 from blaketmiller/lucas

fix 0.006Final
fix 0.006Server

Hostname change to "baricade"