Added Colors and some type adjustments
Adding Media elements.
Merge branch 'master' into andrew

Conflicts:
	atoms.html
Resolving atoms conflicts
Again
Organizing and Adding Media Boxes
Merge pull request #7 from ajrdesign/andrew

Pulling in everything I've been working on