Add part [1]
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	story.txt
Merge branch 'master' of https://github.com/flexyford/story_git_project
add sinatra moviedb practice