shift-columns mixin
rename shift-columns to fancytiles
rename shift-columns to fancy tiles
Merge branch 'develop' into feature/fancytiles
finished fancytiles
Merge branch 'feature/fancytiles' into develop
Merge branch 'develop' of https://github.com/GumbyFramework/Gumby into develop
Renamed touch boolean to touchEvents to avoid conflict with touch callback function
Merge branch 'develop'
Merge branch 'build'
Merge remote-tracking branch 'upstream/develop'

Conflicts:
	sass/_custom.scss
Merge branch 'master' into build