Merge branch 'master' of https://github.com/kbarre123/starterkits_rails4
Merge branch 'master' of https://github.com/kbarre123/starterkits_rails4