Project setup
Merge branch 'master' of https://github.com/alessandrop65/ticketee

Conflicts:
	.gitignore
	ticketee.sublime-project