second commit
third commit
Merge branch 'master' of https://github.com/jeffthorne/ruby-hipchat

Conflicts:
	properties.yml
Merge branch 'master' of https://github.com/jeffthorne/ruby-hipchat
added properties.yml file