updated with corrections
Merge branch 'master' of https://github.com/rashi283/BootstrapWebsite

Conflicts:
	env/mysite/myapp/views.pyc
	env/mysite/mysite/urls.pyc