Osaka 2012 WIP
Merge branch 'master' into osaka2012
Finished parallax background on osaka2012
Added Preparation post