this be Neil's first commit
this is Mark's first commit
Merge branch 'master' of github.com:SenecaCollegeBTSProjects/Team1Repo
alex's initial commit
Pushing up to bts remote
Merge remote-tracking branch 'btsRemote/master'
This is for btsRemote/master
Merge remote-tracking branch 'btsRemote/master'

Conflicts:
	README
created a very basic routine page that does not contain any functionality but listing the routines as radio button list. it needs routines in db to work
Merge pull request #72 from nbguzman/CreateNewRoutine

created a very basic routine page that does not contain any functionalit...
fixed some bugs with old view routine. this now full works and added documentation
Merge pull request #7 from nbguzman/ViewRoutine

View routine
Merge pull request #74 from nbguzman/master

View Routines
merged create user with master
Merge pull request #78 from nbguzman/master

Create User & Log-in/Log-out