Added location and description to the sign up form
Merge branch 'master' of https://github.com/Jon1213/activity_app
Merge pull request #7 from jangelroa/master

Added location and description to the sign up form
added facebook and twitter share buttons
tweet button
merged conflicts, fonts working