Code refactoring
Merge branch 'master' of https://github.com/thebackbox/hostel-website.git