Hall Life section completed

Achievements, Achievements, Calendar
Merge remote-tracking branch 'origin/nicholas' into nicholas

Conflicts:
	assets/css/main.css
	assets/images/Thumbs.db
	assets/images/hall_life/interest/all/5.jpg
	assets/images/hall_life/interest/all/6.jpg
	assets/images/hall_life/interest/all/7.jpg
	facil_amenities.php
	facil_guest.php
	facil_student.php
	hl_interest_all.php
	hl_interest_comms.php
	hl_interest_culture.php
	hl_interest_indexes.txt
	hl_interest_sports.php
	partials/navbar.partial.php
Facilities revamped, Hall life improved, gallery done

Facilities redone to follow new psd and descriptions
Hall life pages tweaked (less padding, alignment of topbar
Media gallery completed
Merging, deconflicting

Merging Nicholas' branch with master
Merge branch 'master' of https://github.com/KR-Infotech/website

Conflicts:
	assets/css/main.css
	partials/navbar.partial.php

I'm not too good at this