WIP
Merge branch 'master' of github.com:anair13/splititwitme

Conflicts:
	public/templates/application.html
nicer commit