added contact form
styled contact form
merging contact
change 1.txt-1
Merge branch 'contact_form'
change 1.txt-2
change 1.txt-3
Merge branch 'contact_form'

Conflicts:
	1.txt
add feature 1
add feature2 page and style file
merged feature 2
add feature3
merge feature3