init.
added: .gitignore
Merge remote-tracking branch 'remotes/athena/master'