initial commit
Merge branch 'master' of https://github.com/chriskinch/drupal-7-chriskinch

Conflicts:
	README.md