added form
Merge branch 'master' of https://github.com/sadeq89/smoothieme

Conflicts:
	public/css/bootstrap.css