Merge branches 'master' and 'michaelskiles' of https://github.com/archcomet/IndecisiveGGJ2014 into michaelskiles
Merge branch 'master' of https://github.com/archcomet/IndecisiveGGJ2014 into michaelskiles
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# Explicit paths specified without -i nor -o; assuming --only paths...
# On branch michaelskiles
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	modified:   styles.css
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	../.idea/
Merge branch 'master' of https://github.com/archcomet/IndecisiveGGJ2014 into michaelskiles
fix floating text
fix floating text some more
removing unnecessary configure
Fixing typo
Merge pull request #14 from archcomet/michaelskiles

Michaelskiles
Merge remote-tracking branch 'origin/master'
Merge branches 'crazylemon64' and 'master' of https://github.com/archcomet/IndecisiveGGJ2014 into crazylemon64
Merge branch 'master' into crazylemon64