Readded check and account stuff
Merge branch 'master' of https://github.com/jromer94/GiftLobber

Conflicts:
	giftlobber/views.py
	giftlobber/views.pyc