gitignore
progress bar done
Merge branch 'master' into step1

Conflicts:
	css/contactus.css