retrying push
new wall
Merge branch 'Display' of https://github.com/Mogogipen/AlveyworldCodeCamp2014 into Display
Merge pull request #2 from Mogogipen/Display

Display