merging
Merge pull request #13 from dcornnell/front_end

Front end
added facebook login
added a login to facebook button
Merge pull request #14 from dcornnell/facebook

Facebook
added maps
added locations
quick fix a little problem
Merge pull request #15 from dcornnell/locations

Locations
oops
quick fix
added some more chart stuff
Merge pull request #16 from dcornnell/stats

added some more chart stuff
huh
Merge pull request #17 from dcornnell/friends

huh
just passing thru
with_pages
got dataTables working on attempts model
Merge pull request #18 from dcornnell/attempts

Attempts
just passing thru