dashboard gan
Merge branch 'master' of https://github.com/13510103/IF3038-2013