bump rails to be ruby 2.0 compatible
Merge branch 'master' of github.com:MidnightDemon/tanuki

Conflicts:
	Gemfile.lock
admin
admin
added admin panel
added admin panel
merge gems
merge gems
Merge branch 'admin'