zomg changes
content changes, fixed links to css & imgs
replaced text with images on landing screen
did some conflict resolution