added a new page and made some changes in styling
Merge branch 'master' of https://github.com/anubhav914/thinkenergy_frontend

Conflicts:
	css/style.css