removed media queries
Merge branch 'master' of https://github.com/lalithkaushik/amarjothi-angular

Conflicts:
	styles/style.css
Merge branch 'master' of https://github.com/lalithkaushik/amarjothi-angular