first commit
new commit
new commit
new commit
new commit
new commit
new commit
new commit
new commit
new commit
home page pretty much done
ignore ds store files
ignore ds store
resolved conflicts