First Commit
Merge branch 'master' of github.com:drumaddict/angularails

Conflicts:
	.gitignore