Merge pull request #11 from niwatoribaka/master

finished styling
Added KHN searching
Fixed conflict in views.py
added buddy