HTMLLLL
Merge branch 'master' of https://github.com/jdl39/HappinessTracker
Displaying friends
Merge branch 'master' of https://github.com/jdl39/HappinessTracker
AJAX let it rip
Merge branch 'master' of https://github.com/jdl39/HappinessTracker
more ajax