Merge branch 'master' of https://github.com/camerongray1515/ilwhack2014

Conflicts:
data/views.py
Merge