Merge pull request #5 from alzearafat/development

Fix merge conflict & merge from kangfend
Update README.md
Merge pull request #7 from kangfend/dev

Update README.md
rubah .gitignore, ganti nama requirement.txt

Kenapa diganti namanya? cek sini:
https://pip.readthedocs.org/en/1.1/requirements.html

Karena kita menggunakan local_settings.py maka settings.py
sebaiknya dikeluarkan lagi dari .gitignore
Merge branch 'dozymoe-update_gitignore'