main change
Merge branch 'master' of https://github.com/flexi-team/LaravelLearn

Conflicts:
	public/css/main.css
Merge branch 'panhnaTesting'
d
add iscroll, phototitle and make shaow like paper curls
Merge branch 'panhnaTesting'