- Modified the app.php and the License file.  We'll see how it goes.
Merge pull request #1 from shawnzizzo/master

- Modified the app.php and the License file.  We'll see how it goes.
Fixing merge conflicts.