update
Merge branch 'master' of https://github.com/sharathreddya/ResumeApp

Conflicts:
	css/style.css