Fixed .edmx
Minor fixes
Removed Neil's stuff to compile, fixed 1 to many error between Exercise
and Routines
Merge pull request #106 from Lynart/edmxRedesign

Fixed .edmx
fixed backwards multiplicity between Exercise and Routine
Merge pull request #107 from andeic/edmxMultiplicity

niiiiiiiceeee
fixed the edmx having the wrong property names and updated it to corispond with our database tables
Merge pull request #108 from maronin/database

fixed the edmx having the wrong property names and updated it to corispo...
Many to many relationship between Exercises and Routines
MuscleGroups added, many to many relationships betwen MuscleGroups and
Exercises
Merge remote-tracking branch 'origin/master' into edmxRedesignPt2

Conflicts:
	App_Code/Layer2.edmx
Made things prettier
USE VS2012!
MuscleGroups removed due to increased complexity of system and need to
rewrite previously written systems.
Bug still exists between Rountine to Exercise
Final version, all fixed
MuscleGroups will remain as a static variable for now
Merge pull request #111 from Lynart/edmxRedesignPt2

Its DONE!!!
updating branch