Initial commit
Merge branch 'master' of github.com:jaketrent/melodrama

* 'master' of github.com:jaketrent/melodrama:
  Initial commit

Conflicts:
	app/views/index.jade