commit
commit
commit
commit
Merge branch 'master' of https://github.com/pallavikhandekar/Peg-a-Page

Conflicts:
	Templates/Pegs.html