week3
week three changes
week 3 revision(css addition).

I made the page look pretty!
week three changes
week 3
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.DS_Store
	week-02/.DS_Store
Merge branch 'master' of https://github.com/Zion1/gbc_comp-9635_01
work stuff
Merge pull request #34 from englishandy/master

work
Merge pull request #33 from Zion1/master

week three
Merge branch 'master' of github.com:alisonsexton/gbc_comp-9635_01 into alisonsexton-master

Conflicts:
	.DS_Store
	week-02/.DS_Store
Merge branch 'master' of https://github.com/calvintennant/gbc_comp-9635_01
week 4

week 4
week 4

week 4
week 4

week 4
week 4

week 4
week 4

week 4
week 4
in progress
still need revising