merged from master
Merge branch 'master' of https://github.com/archcomet/IndecisiveGGJ2014 into gpg
Merge branch 'master' of https://github.com/archcomet/IndecisiveGGJ2014 into gpg
Merge branch 'master' of https://github.com/archcomet/IndecisiveGGJ2014 into gpg
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
rewrote queue internal to audio system to support mute/unmute calls before sounds are available.
added support for the hit events
Merge branch 'master' of https://github.com/archcomet/IndecisiveGGJ2014 into gpg
enabled sound
enabled sound
merged files from louiecarle
merged files from louiecarle
Merge pull request #16 from archcomet/gpg

Gpg