Connected front to back for the first time! Sign in/up works.
Merge branch 'master' of http://github.com/discolemur/biobrainstorm
Plugging the front to the back officially, merging with the main branch.

Conflicts:
	public/angular/controllers.js
	router.js
	signin2.js
	signup2.js