Update angular directives
Update fart actions
Fix conflict
Merge branch 'master' of https://github.com/davekinkead/unicorns

Conflicts:
	index.html
Conflict merge