refactored migrations, and added favorites
fixed up some git stuff
saving before continuing...
home page is beautiful
merged some changes?
fixed jonathan conflict