Merge branch 'master' of https://github.com/YfLn/CEN3031FA14 into yufan
Merge branch 'master' of https://github.com/YfLn/CEN3031FA14 into yufan
Merge branch 'master' of https://github.com/YfLn/CEN3031FA14 into yufan
Merge branch 'master' of https://github.com/YfLn/CEN3031FA14 into yufan
Merge branch 'master' of https://github.com/YfLn/CEN3031FA14 into yufan
check adim role in back
Merge pull request #80 from YfLn/yufan

check adim role in back