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