gitbrol
Merge branch 'master' of https://github.com/thomastuts/Artedex

* 'master' of https://github.com/thomastuts/Artedex:
  Changed some stuff