Merge branch 'master' of ssh://sixteenbliabilitycalculator-comp521.rhcloud.com/~/git/sixteenbliabilitycalculator

Conflicts:
	wsgi/myflaskapp.py
Stella & Jammies + JS/CSS files
Merge branch 'master' of github.com:sixteen-b-liability-calculator/comp521-mirror

Conflicts:
	wsgi/myflaskapp.py