Merge local changes
Merge branch 'master' of github.com:thomastuts/artedex-client