merging py any
Merge branch 'front' of https://github.com/sassafrass6/cs373-idb into front
Merge branch 'front' of https://github.com/sassafrass6/cs373-idb into front
Update.
Teracross: Update the front-end branch to push changes from last night when PythonAnywhere was down.
Teracross: Resolve mrege conflicts on local copy of front-end branch on PythonAnywhere.
adding tap symbols for magic-bacon, rm old circle imgs that have not been used since phase 1
Bacon lookin sexy (as always)
updating css and the base.html page
small edits to views
Merge branch 'front' of https://github.com/sassafrass6/cs373-idb into front
center 6d logo, helper class for base.html titles
Merge branch 'front' of https://github.com/Sassafrass6/cs373-idb into front
updated careers in base_major
merging with jared's bacon
pythonanywhere local change to views
Merge branch 'front' of https://github.com/sassafrass6/cs373-idb into front
Near complete. Bacon page working
pls work bootstrap
Merge branch 'front' of https://github.com/Sassafrass6/cs373-idb into front