fucked shit up

waa waas
Merge pull request #68 from deebost/master

fucked shit up
Merge remote-tracking branch 'origin/master' into swiping
stuff