added something
Merge branch 'master' of github.com:nuadha/phdadm

Conflicts:
	Gemfile.lock