put in a failing test. should not merge into master
Merge branch 'integration'

Conflicts:
	public/scripts/controllers/main.js