update
new movie!
tmp images
now
Merge branch 'master' of https://github.com/cindyloo/devart-template

Conflicts:
	project_posts/2014-03-21-Elegance.md
ignore