Commit before merge'
Wave Corners
Merge branch 'master' of https://github.com/Epiphane/GGJ2014
THOMAS IS THE BEST GUY. SUCH FAVORITE. WOW
Fixing merge conflicts