refactored migrations, and added favorites
fixed up some git stuff
saving before continuing...
home page is beautiful
minor update
Merge branch 'master' into jonathan
merged some changes?
fixed jonathan conflict