test
Merge branch 'master' of https://github.com/gsyarov/showtrackr

Conflicts:
	gulpfile.js
	package.json
	public/app.js
	public/index.html
	public/stylesheets/style.css
	public/views/login.html
	server.js