update
Merge branch 'gh-pages' of https://github.com/ajsingh273/test3 into gh-pages

Conflicts:
	index.html
	stylesheets/stylesheet.css