working on positioning and css
css and index html conflict merge
Merge pull request #25 from jpark1120/master

css and index html conflict merges