Added jobthings styling branch
Merging styling with newly updated version of master
Merge branch 'styling_branch_alisa'
Merged Michael's revised js branch & styling branch together
Merge pull request #87 from tiger-swallowtails-2014/styling_and_new_javascript

Styling and new javascript