about us, privacy, and terms
jQuery video done
user dashboard re-did with tabs
fixed the bottom footer border
dashboard user show view moved to dashboard under tab
formatted search bar, and icons working
Resolves merge conflict
search and cart tests passing
facebook and twitter button how jon likes it
Sets up a basic mailer for password resets
added sending SMS functionality and user permission fixes #110
Fixes the broken search page. Fixes some screwed up HTML.
fixes #111 user can send stop and status messages
api stuff
passing tests
Finishes resetting passwords
fixing things I broke
added production env info
merge conflicts
merge conflicts