Merge branch 'release/1.1'
Added a php file for testing
Merge branch 'feature/test' into develop
Finished with this feature now.
Merge branch 'hotfix/1.0.1'
Merge branch 'hotfix/1.0.1' into develop
Fixed a typo
Added more html
Merge branch 'release/1.0'
Merge branch 'feature/Example' into develop
Merge branch 'refs/heads/mergedemo' into dev
Changed the title to cause a conflict
Changed the title
Added a pagoda box file to the project
Moved all the web docs into a folder
Updated the base template to example with menu bar.
Added Default Bootstrap starting point