Merge pull request #40 from gavroche/master

PR40 - Added support for Composer, Images Wrapping, Unit Testing and started re-writing code to be PSR-2 compliant

Author: Progi1984

.gitignore

@@ -1,11 +1,20 @@
-
+.DS_Store
+._*
+.Spotlight-V100
+.Trashes
+Thumbs.db
+Desktop.ini
+.idea
+phpunit.xml
+composer.lock
+composer.phar
+vendor
 /.settings
 /.buildpath
 /.project
 /docs
-
 *.odt
 *.docx
 *.rtf
 *.txt
-*.xml
+*.xml