update
changes
Merge branch 'master' of https://github.com/Patrickmnts/FlowFree
Merge branch 'master' of https://github.com/ThirdAndjel/FlowFree
Merge branch 'master' of https://github.com/Patrickmnts/FlowFree
update gemfile
some tests
fix schema merge conflict
fix gemifile merge conflict
Merge remote-tracking branch 'upstream/master' into addingtests
update gemfile
Merge pull request #11 from ThirdAndjel/master

Gemfile update and some tests