Test a roll back
Merge branch 'master' of https://github.com/JangoBoogaloo/Some-HCI

Conflicts:
	Assignment/A3/MovieOrganizer/MovieOrganizer.sln
	Assignment/A3/MovieOrganizer/Src/Class/Actor.cs
	Assignment/A3/MovieOrganizer/Src/Class/AdminControlOption.cs
	Assignment/A3/MovieOrganizer/Src/Class/Certification.cs
	Assignment/A3/MovieOrganizer/Src/Class/Genre.cs
	Assignment/A3/MovieOrganizer/Src/Class/Movie.cs
	Assignment/A3/MovieOrganizer/Src/Class/MovieList.cs
	Assignment/A3/MovieOrganizer/Src/Class/User.cs
	Assignment/A3/MovieOrganizer/Src/Class/UserList.cs
	Assignment/A3/MovieOrganizer/Src/Controls/MoviePlotControl.xaml
	Assignment/A3/MovieOrganizer/Src/Controls/MoviePlotControl.xaml.cs
	Assignment/A3/MovieOrganizer/Src/Controls/RangeSlider.xaml
	Assignment/A3/MovieOrganizer/Src/Controls/RangeSlider.xaml.cs
	Assignment/A3/MovieOrganizer/Src/Converter/BooleanVisibilityConverter.cs
	Assignment/A3/MovieOrganizer/Src/Converter/CertificationBooleanConverter.cs
	Assignment/A3/MovieOrganizer/Src/Converter/DataContextMovieConverter.cs
	Assignment/A3/MovieOrganizer/Src/Converter/DoubleDigitConverter.cs
	Assignment/A3/MovieOrganizer/Src/Converter/DoubleIntConverter.cs
	Assignment/A3/MovieOrganizer/Src/Converter/DoubleYearConverter.cs
	Assignment/A3/MovieOrganizer/Src/Converter/ErrorsToMessageConverter.cs
	Assignment/A3/MovieOrganizer/Src/Converter/GenresBooleanConverter.cs
	Assignment/A3/MovieOrganizer/Src/Converter/MovieIDMovieConverter.cs
	Assignment/A3/MovieOrganizer/Src/Converter/RatingToolTipConverter.cs
	Assignment/A3/MovieOrganizer/Src/Converter/ValueScaleConverter.cs
	Assignment/A3/MovieOrganizer/Src/Converter/YearDoubleConverter.cs
	Assignment/A3/MovieOrganizer/Src/CreateEditAccountWindow.xaml
	Assignment/A3/MovieOrganizer/Src/CreateEditAccountWindow.xaml.cs
	Assignment/A3/MovieOrganizer/Src/Data/Copy of movies.xml
	Assignment/A3/MovieOrganizer/Src/Data/movies.xml
	Assignment/A3/MovieOrganizer/Src/Data/users.xml
	Assignment/A3/MovieOrganizer/Src/ForgotPasswordWindow.xaml
	Assignment/A3/MovieOrganizer/Src/ForgotPasswordWindow.xaml.cs
	Assignment/A3/MovieOrganizer/Src/MainWindow.xaml
	Assignment/A3/MovieOrganizer/Src/MainWindow.xaml.cs
	Assignment/A3/MovieOrganizer/Src/MovieManageWindow.xaml
	Assignment/A3/MovieOrganizer/Src/MovieManageWindow.xaml.cs
	Assignment/A3/MovieOrganizer/Src/MovieOrganizer.csproj
	Assignment/A3/MovieOrganizer/Src/MovieOrganizer.csproj.user
	Assignment/A3/MovieOrganizer/Src/MovieOrganizerApp.xaml
	Assignment/A3/MovieOrganizer/Src/MovieOrganizerApp.xaml.cs
	Assignment/A3/MovieOrganizer/Src/Properties/AssemblyInfo.cs
	Assignment/A3/MovieOrganizer/Src/Properties/Settings.Designer.cs
	Assignment/A3/MovieOrganizer/Src/Properties/Settings.settings
	Assignment/A3/MovieOrganizer/Src/ShareMovieWindow.xaml
	Assignment/A3/MovieOrganizer/Src/ShareMovieWindow.xaml.cs
	Assignment/A3/MovieOrganizer/Src/Themes/Generic.xaml
	Assignment/A3/MovieOrganizer/Src/ValidationRules/EmailRule.cs
	Assignment/A3/MovieOrganizer/Src/ValidationRules/MovieTitleRule.cs
	Assignment/A3/MovieOrganizer/Src/ValidationRules/UsernameRule.cs
	Assignment/A3/MovieOrganizer/Src/app.config