Added back Readme.md ... again.
Merge branch 'controller' into view_and_controller
Halfway through Updating Individual Movie
Changelog to follow in next commit
Added Data Model Classes
Changes:
- Added Movie and Tag Data Model Classes for Model Binding with ASP Controls
- Added MovieContext as a DatabaseContext for data Access
Added connectionString to Web.config
Chanes:
- "CrowdMovieTag" connection string added
  - Linked to "appdb.mdf"
- ConnectionString is used by MovieContext.cs
Added Login Functionality
Changes:
- Modified DefaultConnection database connection string in Web.Config for user logins.
- Startup.Auth.cs: Uncommented the line to allow google authentication
- Added a New folder: "PowerTheEngine" that will contain any pages that add data.
   - This folder is restricted to users that have been logged in
   - AddMovie.aspx has been moved to this folder.
Implemented a Dynamic Profile Page
The profile page now retreives a user from the Profiles table in the database.
If a user is not found, a proper message is displayed. The page now retrieves a user based on the username in the query string. If no user is specified, then the current user is retrieved.

Next: Implement Edit Profile and query the database for the movies that the user has tagged.

Changes:
- Added: Profile.cs: the Model for binding a row of the "Profiles" table
- MovieContext: Added Profile to the DbContext
- Added: MovieDatabaseInitializer: populates the Profiles table with Sam and Trent
- Global.asax.cs: Added the ProductDatabaseInitializer to initialize the database on application start
- User_Profile.aspx: added an asp:FormView tag to view a bound Profile
- User_Profile.aspx.cs: Added the GetProfile() method to query the database for the Username in the query string.
Added Editing/Viewing Profiles
Changes:
- Added: PowerTheEngine/EditProfile
   - Only allows you to edit your own profile
- Model/Profile.cs: Removed required fields
- User_Profile.aspx: Changed it over to an asp:FormView to view bound data
   - Changed EditProfile button to only be visible if you are viewing your own profile
- Account/Register.aspx.cs: Added creation of an entry in the Profiles table for a new user
Included the Movies and Tags table in the Initializer
The database will now be initialized with one default entry in the Movies and Tags table.

Changes:
- Movie.cs: Naming scheme updated to ASP.Net reccomended naming scheme
   - Need to sync this up with Steve
- Tag.cs: Same thing as with Movie.cs
- MovieDatabaseInitializer: Added Movies and Tags to the initializer
- MovieContext.cs: Aded back Movies and Tags
- EditProfile: Moved "Update" button into the ItemTemplate so it isn't displayed when a user isn't logged in
- UserProfile.aspx: Moved Edit Profile button out of the asp:FormView
- UserProfile.aspx.cs: edited to reflect the change in UserProfile.aspx
- Web.config: Changed the database name to crowdmovietag.mdf
Added back Readme.md ... again.
Halfway through Updating Individual Movie
Changelog to follow in next commit
Addressed Several Assignments

Additions:
* ShowAllMovies: Created a new page to show all movies in the database.
I added a table, to be populated the same way all of the other tables
are.

* In the footer, I added a link to "Contact Us"

Modifications:
* Edited the space between the navigation bar and the first div,
headline, or image, so when the page is smaller, the navigation bar does
not cut it off.

* Changed the page names in aspx and aspx.cs files:
- Advanced_Search is now AdvancedSearch.
- Rewards_Points is now RewardsPoints.
- Search_Results is now SearchResults.
- User_Profile is now UserProfile
- TermsandConditions is now TermsAndConditions

* Cleaned up the footer portion of pages Login, Manage, Register by
adjusting the spacing.

* Updated the cover image url to /Images/CrowdTagMovieTheater.png

* Updated the image in that file location as the image was not the most
recent version.

* Site.Master: Changed the tabs in the navigation bar.  When the tabs
take too much space and the screen is narrow, the navigation bar became
three rows.  In the current format, even when a user is logged in, it
only uses two rows.
- Also updated the links in the navigation bar to the new page names.
Merge branch 'view' into view_and_controller

* view:
  Addressed Several Assignments
  Halfway through Updating Individual Movie Changelog to follow in next commit
  Added back Readme.md ... again.
  Included the Movies and Tags table in the Initializer The database will now be initialized with one default entry in the Movies and Tags table.
  Added Editing/Viewing Profiles Changes: - Added: PowerTheEngine/EditProfile    - Only allows you to edit your own profile - Model/Profile.cs: Removed required fields - User_Profile.aspx: Changed it over to an asp:FormView to view bound data    - Changed EditProfile button to only be visible if you are viewing your own profile - Account/Register.aspx.cs: Added creation of an entry in the Profiles table for a new user
  Implemented a Dynamic Profile Page The profile page now retreives a user from the Profiles table in the database. If a user is not found, a proper message is displayed. The page now retrieves a user based on the username in the query string. If no user is specified, then the current user is retrieved.
  Added Login Functionality Changes: - Modified DefaultConnection database connection string in Web.Config for user logins. - Startup.Auth.cs: Uncommented the line to allow google authentication - Added a New folder: "PowerTheEngine" that will contain any pages that add data.    - This folder is restricted to users that have been logged in    - AddMovie.aspx has been moved to this folder.
  Added connectionString to Web.config Chanes: - "CrowdMovieTag" connection string added   - Linked to "appdb.mdf" - ConnectionString is used by MovieContext.cs
  Added Data Model Classes Changes: - Added Movie and Tag Data Model Classes for Model Binding with ASP Controls - Added MovieContext as a DatabaseContext for data Access

Conflicts:
	CrowdMovieTag/CrowdMovieTag.csproj
	CrowdMovieTag/Models/MovieDatabaseInitializer.cs
	CrowdMovieTag/ShowAllMovies.aspx.designer.cs
	CrowdMovieTag/User_Profile.aspx
	CrowdMovieTag/User_Profile.aspx.cs
	CrowdMovieTag/individual_Movie.aspx
Verified Functionality of Trent's Merge from View into View_And_Controller.
Required modification of CrowdMovieTag.csproj because of an error in merging.
- Deleted appdb.mdf.
Removed crowdmovietag_log.ldf
Merge branch 'controller' into view_and_controller

Resolved conflicts and confirmed functionality.

* controller:
  Completed MovieDetails.aspx

Conflicts:
	CrowdMovieTag/App_Data/crowdmovietag_log.ldf
	CrowdMovieTag/CrowdMovieTag.csproj
	CrowdMovieTag/Models/MovieDatabaseInitializer.cs
	CrowdMovieTag/Models/TagMap.cs
	CrowdMovieTag/individual_Movie.aspx
	CrowdMovieTag/individual_Movie.aspx.cs
	CrowdMovieTag/individual_Movie.aspx.designer.cs
Cleaned up an escaped merge conflict
Edited TODO Notes and merged from view_and_controller
Also: Edited .gitignore to ignore mdf and log files