pls let me pull
Merge branch 'master' of https://github.com/HyperWind/MovieDB-Client
Initial commit
added in some stuff
Merge branch 'master' of https://github.com/HyperWind/kouhaiBOT

Conflicts:
	.gitignore
	LICENSE
	README.md