First commit - Assignment 01
Second commit - Content changes
changes
name changed
resolving conflicts
Layout changes - 90% done
NEW CHANGES
Final Digg Website

My final Assignment
Final files
Merge branch 'gh-pages' of https://github.com/dreds-10/assign02_DiggWebsite into gh-pages

Conflicts:
	index.html