Added [[include:]] syntax to allow limited nesting of other pages.
Added two more tests for [[include:page]] feature to ensure it can't be used to execute Javascript.
Let's try this instead
Fix typo in `GitAccess#initialize`
Merge pull request #40 from jugglingnutcase/error-typo

Fix typo in `GitAccess#initialize`
Merge pull request #38 from matthewbloch/master

Added [[include:]] syntax to allow limited nesting of other pages.
Merge remote-tracking branch 'origin/rugged' into rugged
Merge remote-tracking branch 'upstream/master' into rugged

Conflicts:
	lib/gollum-lib/git_access.rb
	lib/gollum-lib/page.rb