changed ROR to rails
Merge branch 'master' of github.com:lightcastle/djangowebsite
adding trademark
Merge branch 'master' of github.com:lightcastle/djangowebsite
taking stuff out