LockScreen added
Merge branch 'master' of https://github.com/42IN11EWd/RAS-app

Conflicts:
	RunApproachStatistics/App.xaml.cs
Merge branch 'master' of https://github.com/42IN11EWd/RAS-app