changes to index.html
Merge branch 'master' of https://github.com/AustinClift/DigitalFlash

Conflicts:
	angular-seed-master/app/index.html
mark-up for index.html, making bootstrap functional
Marking up index.html
Merge branch 'master' of https://github.com/AustinClift/DigitalFlash

Conflicts:
	app/components/styles/base.less
	app/index.html
Integrating bootstrap and marking up views [axof:78]
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/home.html
:tada: Added .gitattributes
Integrating bootstrap and marking up views [axof:78]