aa
aaMerge branch 'master' of https://github.com/parkjuram/beauty-in-arsdale

Conflicts:
	app/models.py
	error.log
asf
pjr commit
add gitignore file
Merge branch 'master' of https://github.com/parkjuram/beauty-in-arsdale