setup
Create README.md
test setups
updated
more stuff ignored
stuff deleted
stuff unignored
stuff
stuff
fixed conflicts?
set up index.html