tweeked language in views
added a ton of css!
tons more css
these are terrible commit messages...but more css
merge conflict
no changes?
merge conflict
wip
controller editing