Merge branch 'master' of https://github.com/michaelmcchen/tintern
Merge branch 'master' of https://github.com/michaelmcchen/tintern

Conflicts:
	config/routes.rb
Merge branch 'master' of https://github.com/michaelmcchen/tintern
Merge branch 'master' of https://github.com/michaelmcchen/tintern
Merge branch 'master' of https://github.com/michaelmcchen/tintern
Merge branch 'master' of https://github.com/michaelmcchen/tintern
Merge branch 'master' of https://github.com/michaelmcchen/tintern
Merge branch 'master' of https://github.com/michaelmcchen/tintern
Merge branch 'master' of https://github.com/michaelmcchen/tintern
Merge branch 'master' of https://github.com/michaelmcchen/tintern
Merge branch 'master' of https://github.com/michaelmcchen/tintern
Merge branch 'master' of https://github.com/michaelmcchen/tintern
Merge pull request #5 from michaelmcchen/ricky_swipe_views

Ricky swipe views
Merge pull request #6 from michaelmcchen/ricky_swipe_views

remove bio.image check
Merge pull request #7 from michaelmcchen/ricky_swipe_views

put button javascript inside ruby code to access url
Merging
Merge branch 'master' of https://github.com/michaelmcchen/tintern
S fix
Seed Data
Seed data