Initial commit
Merge branch 'master' of github.com:xbelanch/Quirkaglitch
minor changes
Merge branch 'master' into dev