more stuff
Merge pull request #81 from jhaybie/swiping

more stuff
Merge remote-tracking branch 'WorkingCopy/master'
w