First commits
Merge branch 'master' of github.com:jyarrington/sailsalem_admin