init
Merge branch 'master' of github.com:ragulan77/athena

Conflicts:
	.gitignore
	README.md