Update .gitignore
Merge pull request #172 from rylai-/master

travis: use apt-get -y option instead of GNU yes
Merge pull request #1 from irungentoo/master

pull latest
Fixed a bunch of bugs in TOXIC, added friendlist and more.
Merge pull request #175 from plutooo/master

Fixed a bunch of bugs in TOXIC, added friendlist and more.
Merge pull request #174 from Shivamshaz/patch-1

Update .gitignore
Update nTox.c

Gives the user his ID.
Merge pull request #178 from theshadowfog/patch-3

Update nTox.c
Update nTox.c

Edited help message.
Modified Travis to build libconfig from sources
Merge branch 'master' into nurupo-master

Conflicts:
	.travis.yml
Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core
README.md: s/Freenode/freenode/
Merge pull request #182 from RichiH/patch-1

README.md: s/Freenode/freenode/
Merge pull request #179 from theshadowfog/patch-5

Update nTox.c
Add tutorial videos to readme

I promise they're legit<3
break line
Remind users that directory isn't actually legit
Update Messenger.c

Offer more meaningful returns so appropriate actions can be taken by the GUI.
Merge pull request #183 from Proplex/master

Update readme with tutorial videos