Merge remote-tracking branch 'refs/remotes/origin/master' into gh-pages
initial file creation for layout assignment
added html for columns 1 and 2.
added col1 and 2 intro css.
created footer element and added links to it. added clear to links div to correct format issues
checked for text px and converted where necessary. fixed second column being pushed to bottom using margin-left attribute.
refiling of assignment after file system disaster.
Resub of files after hdd meltdown.
Merge remote-tracking branch 'refs/remotes/origin/gh-pages'