Committing hopefully the last changes
Committing!
Merge branch 'master' of https://github.com/Jacketpages/Jacketpages