Initial commit
HTML5 for CupCake Website
Merge branch 'master' of https://github.com/spraveenitpro/TeamTreeHouse
CSS3 for CupCake Website
Started Java script lessons
Merge branch 'master' of https://github.com/spraveenitpro/TeamTreeHouse

Conflicts:
	CupCake Website/css/grid.css
	CupCake Website/css/normalize.css
	CupCake Website/css/style.css
	CupCake Website/css/styleofficial.css
	CupCake Website/img/bg-texture.jpg
	CupCake Website/img/facebook.gif
	CupCake Website/img/featured-cupcake.jpg
	CupCake Website/img/logo.gif
	CupCake Website/img/new-cupcake-bacon.jpg
	CupCake Website/img/new-cupcake-caramel.jpg
	CupCake Website/img/new-cupcake-jalapeno.jpg
	CupCake Website/img/popular-cupcake.jpg
	CupCake Website/img/texture.png
	CupCake Website/img/twitter.gif
	CupCake Website/img/you-bake-me-blush.gif
	CupCake Website/index.html
	README.md