Partial changes
Merge branch 'master' of github.com:aravindet/mvcafe
Merge branch 'master' of github.com:aravindet/mvcafe
Partial changes

Conflicts:
	public/index.html
	public/style.css
Merge branch 'master' of github.com:aravindet/mvcafe
Done I guess?