Update readme file
Merge branch 'master' of https://github.com/githubstudent/geekout

Conflicts:
	README.md