Merge branch 'develop' of https://github.com/chip2int/ParkSwap into develop
Merge branch 'develop' of https://github.com/bioball/ParkSwap into develop
app sends a message to a rider that their search has expired
remove design from gitignore
Merge pull request #15 from chip2int/develop

Rider coming implementation
Merge branch 'develop' of https://github.com/bioball/ParkSwap into develop
Removed commented out routes, and added semicolons to riderServices
stuff
Merge branch 'develop' of https://github.com/bioball/ParkSwap into develop
when a rider cancels, the parker's view now updates properly
submit buttons now work
modified package.json name and upgraded to version 0.1
v0.1.0
login page and main page css done
finished where page, naive solution for borders and google maps
added slide-down directive, and added styling for wait page
more work done on CSS
Updated bower json file
Merge branch 'develop' of https://github.com/bioball/ParkSwap into develop

Conflicts:
	public/lib/bower.json
Call rider and parker functions now working with android and ios