Updating flicks factory
Factorriiesss
Platform / Angular Intergration
Merge branch 'master' of github.com:JeremyWright/rt-r

Conflicts:
	views/index.ejs