Initial commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
added orig
gemfiling like in the internet
bundled
modifying the gitignore
ruby1.9.1 -> ruby
Merge branch 'master' into develop
todo.txt