Completed first phase frontend
Merge branch 'master' of https://github.com/Screengoose/ski-team