update ignore
update .gitignore
Add index.html
add settings
Merge branch 'master' of https://github.com/markcablayan/zillow-rating-system
Merge branch 'master' of https://github.com/markcablayan/zillow-rating-system.git
Merge branch 'master' of https://github.com/markcablayan/zillow-rating-system.git
Modify GreetingController.java and zillow_home.html
Merge branch 'master' of https://github.com/markcablayan/zillow-rating-system
update GreetingController.java and zillow_home.html
fix conflict on zillow_home.html
update no-sidebar.html