Merge branch 'master' of github.com:mattuuh7/TrelloScrum

Conflicts:
	trelloscrum.js
Merge branch 'master' of github.com:bbyk/TrelloScrum into crazy_fix

Conflicts:
	trelloscrum.js
Merge pull request #5 from bbyk/crazy_fix

merge through github