Test foo commit
Amended Rooms section; added Alumni group

The sections might need to be repositioned, as well as the Alumni group
link
Competitions section updated
Introduction to competitive section amended

also some section titles
fixed links in competitive section
ammendments to beginners team section
Implemented Robert's comments in pull request
Robert's changes fetched and merged
Revert "Robert's changes fetched and merged"

This reverts commit 168bdc8b495a1227a41f6ab0e3317cadbfc188c6, reversing
changes made to ded06a067ae0f2c59d1a283b17d0274ef79b0336.
Revert "use absolute paths after introduction of base tag"

This reverts commit b6300e4cced2ed272a02053e1d6e9b5b0de9ad07.

Conflicts:
	src/jade/index.jade
Revert ded06a0..2cbf5d1

This rolls back to commit ded06a067ae0f2c59d1a283b17d0274ef79b0336.
Merge remote-tracking branch 'robert/master'
Revert "Revert ded06a0..2cbf5d1"

This reverts commit 84b2f6ef4a28fc370ba2c99c24c757b4c7ae6559.
Sync with Robert's master

two conflicts resolved
Beginners section improved
Note for current beginners removed
FAQ amended

Some broken links fixed, as well as main menu FAQ link
merge faq
remove spurious image
group competitive dancing together