asdasdsad
james
james
commit
Merge branch 'master' of https://github.com/finpo/alala-age

Conflicts:
	alala/public/images/676.jpg
	alala/public/scss/style.scss