Fixed gemfile issue on master branch
Fixed merge conflict
Basic layout looking good
Layout is good, just need to update content
Final edits