On branch master
Your branch is up-to-date with 'origin/master'.

Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

	deleted:    www/templates/leaderboard/leaderboard-row.html~

Unmerged paths:
  (use "git reset HEAD <file>..." to unstage)
  (use "git add/rm <file>..." as appropriate to mark resolution)

	deleted by us:      www/css/ionic.app.css
	deleted by us:      www/css/ionic.app.min.css

Untracked files:
  (use "git add <file>..." to include in what will be committed)

	.sass-cache/
	scss/_leaderboard.scss~
	scss/ionic.app.css
	scss/ionic.app.scss~
	www/index.html.orig
	www/index.html~
	www/js/app.js~
	www/js/controllers.js~
	www/js/services.js~