Signed-off-by: Harrding <harrisond2003@gmail.com>
Merge branch 'master' of https://github.com/OldGuo/MVFBLA_E-Business_2014_2015.git

Conflicts:
	css/navbar.css

Signed-off-by: Harrding <harrisond2003@gmail.com>