fixed the caption bug by adding a conditional
resolved conflict in index.erb
resolved conflict in app.rb
index erb fix
google font links adjustment
profile nav
division defined in profile
profile color complete
style applied for delete account
added nav bar border
merging branch