Slight changes
Merge remote-tracking branch 'ProjectTox/master'
Fixed friends list and deleting friends. Automatically loads name/status from last time.
Merge branch 'master' of https://github.com/Astonex/ProjectTox-Core into Astonex-master

Conflicts:
	testing/nTox_win32.c
Merge pull request #227 from Proplex/master

Add help command to Toxic
corrected comment and removed forced message for friend adds
fixed friend add bugs
added cmake to osx brew instructions
Add sodium/ to .gitignore

Because Windows devs.
Move start_guide.md to docs/ and delete using_tox.md

`start_guide.md` is virtually an exact duplicate of `using_tox.md`.
Add nicknames to the chat list

Change from [chat <number>] to [<nickname> (<number>)]
Update start_guide.md

Fixed a spelling mistake.
Update start_guide.md

More edits.
restored this branch to be on par with upstream
mac on homepage
mac on homepage
add cmake to brew packages
Use print_usage for help command
Merge pull request #236 from CharmlessCoin/network

Add get_broadcast()
Merge pull request #237 from chovy/master

Add Mac OSX instructions