testing
removed rails
Merge branch 'master' of github.com:pam-/pam-.github.io

Conflicts:
	README.md
fixing conflicts