Merge pull request #3 from willametteuniversity/fhaynes

Fixed a syntax error. Fixed a missing __init__.py.
Merge pull request #5 from willametteuniversity/fhaynes

Fixed a syntax error. Fixed a missing __init__.py.
Merge branch 'fhaynes' of https://github.com/willametteuniversity/webcirc2 into hparker

Conflicts:
	webcirc2/__init__.pyc
	webcirc2/settings.pyc
	website/serializers.py
	website/urls.py
	website/views.py
Merge remote-tracking branch 'origin/hparker' into hparker

Conflicts:
	webcirc2/__init__.pyc
	webcirc2/settings.pyc
	website/serializers.py
	website/urls.py
	website/views.py
Merged in changes, fixed pep8 spacing, removed unneeded imports
Finished API outline, unit testing and fixing
More fixes to tests. Made fixtures for some classes
Needed to specify content type and use json method to serialize json for put request
Finished action type API as well
Merge pull request #7 from willametteuniversity/hparker

Hparker
made some changes to urls.py and views.py
Added url for category hierarchy
Merge branch 'development' of https://github.com/willametteuniversity/webcirc2 into development
added a Category Hierarchy view that displays a hierarchy of categories in the database
Merge pull request #8 from willametteuniversity/development

Development