put app/config/database.php into .gitignore, because db password different on two machines
Merge branch 'master' of https://github.com/ozteng/learning-laravel