changed paths for views
Link to sign in
Merge branch 'master' of https://github.com/michaelmcchen/tintern
Added edit profile functionality
Merge branch 'master' of https://github.com/michaelmcchen/tintern
Merge branch 'master' of https://github.com/michaelmcchen/tintern into ricky_swipe_views

Conflicts:
	config/routes.rb
assets + swipeR view
super pretty + keyboard arrow keys trigger the buttons
rename swipe.css to swipeR.css
add stub swipeR, swipeS to not auto-load css styles to every page
precompile swipeS.css + swipeR.css
remove a comment
template for swipeS.html.erb
properly comment out embedded ruby code
actually properly comment out erb code
class level next to years in education
swipeS (view of company details) template, rename linkedin logo, add twitter button