Additions for adding a tournament

 Committer: Aylw <aylw@aylw-UL30A.(none)>

 On branch master
 Changes to be committed:
	modified:   public/js/app.js
	modified:   public/js/controllers.js
	modified:   public/js/services.js
	modified:   views/index.jade
	new file:   views/partials/base.jade
	modified:   views/partials/partial2.jade
	new file:   views/partials/tournament_new.jade
Merge branch 'master' of https://github.com/SilvioAmaral/Joust

Conflicts:
	public/js/controllers.js
	views/index.jade
Merge branch 'master' of https://github.com/SilvioAmaral/Joust

Conflicts:
	public/js/app.js
	public/js/controllers.js
	public/js/services.js

 Committer: Aylw <aylw@aylw-UL30A.(none)>
 On branch master
 Changes to be committed:
	modified:   .idea/workspace.xml
	modified:   app.js
	modified:   public/js/app.js
	modified:   public/js/controllers.js
	modified:   public/js/services.js
	modified:   routes/api.js
	modified:   views/index.jade
	modified:   views/partials/tournament_new.jade
	modified:   views/partials/tournaments.jade