KB
Merge branch 'master' of https://github.com/parkjuram/beauty-in-arsdale

Conflicts:
	app/views.py
aa
Merge branch 'master' of https://github.com/parkjuram/beauty-in-arsdale
aaa
Conflicts:
	app/views.py
Merge branch 'master' of https://github.com/parkjuram/beauty-in-arsdale
Merge branch 'master' of https://github.com/parkjuram/beauty-in-arsdale
Merge branch 'master' of https://github.com/parkjuram/beauty-in-arsdale
Merge branch 'master' of https://github.com/parkjuram/beauty-in-arsdale
Merge branch 'master' of https://github.com/parkjuram/beauty-in-arsdale
Merge branch 'master' of https://github.com/parkjuram/beauty-in-arsdale
form kb
Merge branch 'master' of https://github.com/parkjuram/beauty-in-arsdale
Merge branch 'master' of https://github.com/parkjuram/beauty-in-arsdale
Merge branch 'master' of https://github.com/parkjuram/beauty-in-arsdale
from test
Merge branch 'master' of https://github.com/parkjuram/beauty-in-arsdale
iiii
Conflicts:
	app/static/css/common_style.css
Merge branch 'master' of https://github.com/parkjuram/beauty-in-arsdale
Merge branch 'master' of https://github.com/parkjuram/beauty-in-arsdale
Merge branch 'master' of https://github.com/parkjuram/beauty-in-arsdale
Merge branch 'master' of https://github.com/parkjuram/beauty-in-arsdale