fixed video page merge issue
merge conflict
added to seed file
cleaned up seed file and added angry colors"
Merge branch 'master' of github.com:keikajones/animote