refactored migrations, and added favorites
fixed up some git stuff
saving before continuing...
minor update
Merge branch 'master' into jonathan
merged some changes?
fixed jonathan conflict
merged into master again, conflicts resolved
merged into master again, conflicts resolved
updated front page