tasha's work
homework1
updated
styles
updated-2
fixing conflicts with master branch, premerge
Merge pull request #5 from gingerrific/groupwork

Tasha