delete EVERYTHING *muahahaha*
Merge branch 'master' of github.com:irisSchaffer/webapplications-drupal

Conflicts:
	.DS_Store