Finish screencast 2
Update global config
Merge branch 'master' of https://github.com/Jeasty/StarwarsEvents

Conflicts:
	README.md
Add comment to default controller