Initial load
Merge branch 'master' of https://github.com/fmquaglia/angeles_ruby

Conflicts:
	.gitignore