Merge branch 'master' of https://github.com/groenborg/FlowTwo

Conflicts:
src/dk/kasper/simon/FlowTwo.java
lol