starting bdbranch
del temp/index2.html
added .idea to .gitignore
removed .idea from repo
first implementation using template inheritance
first implementation using template inheritance
first implementation using template inheritance
style integration
jhMerge branch 'bdbranch' of github.com:bdxhosting/laurendennishair into scott

Conflicts:
	static/css/style.css
	static/img/homeslides/slide1.jpg
	static/img/homeslides/slide2.jpg
	static/img/homeslides/slide3.jpg
	static/js/jquery.nivo.slider.pack.js
	templates/base.html
	templates/index.html