Removed static size from right module...this is after we already did everything in your room
Merging stuff
Merge branch 'master' of https://github.com/Xrave/CourseSurfer

Conflicts:
	index.html