basic comments working, and some better styling added
fix conflict
removed DS_Store