Initial create user stuff
Initial workings on LimitBreaker

Need to finish createUser.aspx.cs
Merge branch 'master' of github.com:Lynart/Project-LimitBreaker into newUser
Stupid binary database files :@
Merge remote-tracking branch 'origin/master' into createLimitBreaker
Temp commit to change branches to fix .edmx
Merge branch 'edmxRedesignPt2' into createLimitBreaker

Conflicts:
	App_Code/Layer2.edmx
made the calendar better. Adding exercises now works. Adding Routines doesnt work yet, since I need Neil's code and manager class. Few issues: Scheduling an exercise is possible on the same start time. Picking start date is a little anoying, since if you want to change the month, the page refreshes. Might need to use Ajax or somthing. Also made the masterpage wider. Added a method to get an exercise by an ID, in the exercise manager.
removed uneeded method
added an updatepanel
testing out how to start modifying/deleting routines
delete routine works now
modify routines now work. just gotta make things neat
finished deleting and modifying a routine
Merge branch 'DeleteModifyRoutine'
Merge branch 'master' of git://github.com/Lynart/Project-LimitBreaker into issue#69
Scheduling routine and exercise works fully. Made the Calendar prettier again. Changed the masterpage a bit, by removing suggest custom exercise button.
Merge pull request #118 from nbguzman/master

Delete and Modify a Routine
Merge branch 'master' of git://github.com/Lynart/Project-LimitBreaker into issue#69
Merge branch 'master' of github.com:Lynart/Project-LimitBreaker into issue110