Merge branch 'master' of https://github.com/matthewdpace/klubhaus

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

schemamigration on khklubs required
starting work on them and creating views.
working with staticfiles and bootstrap
Merge branch 'master' of https://github.com/matthewdpace/klubhaus

Conflicts:
	klubhaus/khklubs/models.py
	requirements.txt
Merge branch 'master' of https://github.com/matthewdpace/klubhaus