Renamed friending to fanning
Merge branch 'master' of https://github.com/AvatarKava/SparkleBot
Merge branch 'master' of https://github.com/AvatarKava/BeavisBot
Merge branch 'master' of https://github.com/AvatarKava/BeavisBot
Merge branch 'master' of https://github.com/AvatarKava/BeavisBot
Merge branch 'master' of https://github.com/AvatarKava/BeavisBot
Merge branch 'master' of https://github.com/AvatarKava/BeavisBot
Merge branch 'master' of https://github.com/AvatarKava/BeavisBot
Merge branch 'master' of https://github.com/AvatarKava/BeavisBot
Merge branch 'master' of https://github.com/AvatarKava/BeavisBot
Merge branch 'master' of https://github.com/AvatarKava/BeavisBot
Merge branch 'master' of https://github.com/AvatarKava/BeavisBot
Merge branch 'master' of https://github.com/AvatarKava/BeavisBot
Merge branch 'master' of https://github.com/AvatarKava/BeavisBot
Merge branch 'master' of https://github.com/AvatarKava/BeavisBot

Conflicts:
	sparkle.js