second commit
Merge branch 'master' of https://github.com/Call-to-Ask-Kung-Fu/Django-online-qr-maker

Conflicts:
	qr/.DS_Store
	qr/maker/.DS_Store