angular seed
Merge branch 'master' of github.com:vi-s/angular-f1feeder-app

Conflicts:
	README.md