Merge branch 'gh-pages' of https://github.com/mrado1/ExperimentalMedia2014 into gh-pages
Merge branch 'gh-pages' of https://github.com/bakercp/ExperimentalMedia2014 into gh-pages
Adding MorseBasic
Adding Week 5 Sol Lewitt Drawing
Updating to new version of SolLewitt1971
Adding Week 6 assignments
Update members.yml
Adding People post
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages
Merging local branch
Adding Weeks 7, 8, 9 — could not get image to rotate in 9.
deleting another file
Merge branch 'gh-pages' of https://github.com/mrado1/ExperimentalMedia2014 into gh-pages

Conflicts:
	_data/members.yml

Syncing branch
Merge branch 'gh-pages' of https://github.com/bakercp/ExperimentalMedia2014 into gh-pages
Adding weeks 10 and 11
deleting extraneous files
Removed apps.
Fixed collision.
Fixed conflicts.
Merge pull request #14 from mrado1/gh-pages

MorseBasic