Fixed merge conflict
Fixed merge conflict
Installed imageMagick and added dummy data
Fixed merge with css file
Fixed Gemfile to fix bootstrap loading issue
Added minor changes to troubleshoot Bootstrap
Removed unneed public files
Added html to test current user on index page
Added test images for homepage
Modifed padding on body content