Merge branch 'master' of https://github.com/mgyucht/Summer_2012
Merge remote-tracking branch 'origin/master'