Committing my settings so i can pull
Merge branch 'master' of https://github.com/mitchgt/prepay

Conflicts:
	prepay/settings.py
Worked on unit tests.
Merge branch 'master' of https://github.com/mitchgt/prepay