second commit
Merge branch 'master' of https://github.com/jiminsong/Spectacle

Conflicts:
	README
second commit