adding contributors from 2014, yay!
tweaking param, merging in pull request
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md