Index.html
Merge branch 'master' of https://github.com/christophetd/hackathon
Merge branch 'master' of https://github.com/christophetd/hackathon
Merge branch 'master' of https://github.com/christophetd/hackathon
final changes
final
Merge branch 'master' of https://github.com/christophetd/hackathon

Conflicts:
	public/app/js/SourcesView.js