ignore public
remove public
Merge branch 'master' of github.com:WeAreDev3/jetstream

Conflicts:
	public/js/main.min.js