refactor image icons
ignoring tmp
updating Gemfile to fix dependency problems
untracking swap file
socket.io node module update
fixing user model