initial commit
Merge branch 'master' of git://github.com/biocore/emperor into issue_282
Merge branch 'master' of git://github.com/biocore/emperor into issue_282
final changes for initial pr
removing comment
fixing event for when the user hits esc without selecting anything
Fix #213
adding comment to changelog
changing changelog and license
Merge pull request #308 from antgonza/issue_213

Fix #213
git pull stream master
removing duplicated lines
Merge pull request #307 from antgonza/issue_282

Issue 282
Merge branch 'master' of git://github.com/biocore/emperor into issue-271

Conflicts:
	ChangeLog.md