Adding doc blocks, and reformatting for PSR-2
Switching up gitignore
Merge branch 'master' into develop

Conflicts:
	.gitignore
Merge pull request #19 from aequasi/develop

Develop