added trainer MVC
Merge branch 'master' of https://github.com/thomastuts/artedex-client

* 'master' of https://github.com/thomastuts/artedex-client:
  Removed pokemon images
  Add AJAX file upload
  Include foundation & rework basic style for development
trainer page
fix merge confict