Merge pull request #10 from ZackAlfakir/master

Formatting and Documentation
Merge pull request #11 from ZackAlfakir/master

Made fixes to Phoomatics and added Kate temp files to .gitignore
Merge branch 'master' of git://github.com/anidev/612-2014-advanced
made non static (Swaraj iz whack)