made folder
updated the index.html file
here we go
combined branches
fixed stylesheets
back to having css in index.html document
commented out reference
back to referenced version
padding 100
style 60
reverted
Merge branch 'develop' of https://github.com/jthurst3/bitstarter into develop

Conflicts:
	about.html
	index.html
	web.js
added index.html
added web.js