contact form components css changed
resolved merge conflicts
resolved merge conflicts
Merge branch 'ISSUE_15' of github.com:vineetasharma/InstaWeather into ISSUE_15

Conflicts:
	web-app/dev/views/contact.html