Query using the entire object of user info. instead of just name
Merge branch 'master' of https://github.com/germTheory/germTheoryWebApp
minor changes
Merge branch 'master' of https://github.com/germTheory/germTheoryWebApp

Conflicts:
	specs/server/proximity.spec.js
modified spec
Query using the entire object of user info. instead of just name
minor changes
modified spec
Merge remote-tracking branch 'origin'
modified spec for signup
Merge pull request #127 from suprbh/master

Specs change
Uses html for options rather than angular, updates ionicons
Adds tracking confirmation and login page
Uses html for options rather than angular, updates ionicons
Merge pull request #128 from jamesongamble/master

CSS and HTML changes, begins creating login page and tracking page