lol
Merge branch 'master' of https://github.com/yukuan/recco

Conflicts:
	MyMedia/static/MyMedia/style.css
Merge branch 'master' of https://github.com/yukuan/recco
new list style
Merge branch 'master' of https://github.com/yukuan/recco