Cleanup master -- reposition merged divs
Merge pull request #7 from tiy-durham-june2014-frontend/mastercleanup

Cleanup master -- reposition merged divs