Added some stuff and changed some stuff.
Merge branch 'master' of https://github.com/daekano/base-template