Last commit for the night
before heroku push
no fade
fade is back
give it a go
fixed conflect
push to heroku
Merge branch 'working_demo'
commit before trying to merge to master after project is over
rake seed seems to be working
Merge branch 'working_demo'
bug fixes
fixed black and white bug
removed fade in
fixing seed
still fixing seed
adding fade back
Working on heroku