messing with angular
fixed merge issue
trying to fix angular
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team2
Merge pull request #16 from jvh1979theironyard/master

Got that technique crud done
fixed angular routing issue
Merge pull request #17 from natalie03/master

fixed issue
fixed GET error
Merge pull request #18 from ansleyjones/master

fixed GET error
fixed
merge
added main index page
Merge pull request #20 from natalie03/master

added main page
adding link to user profile
Merge pull request #21 from natalie03/master

adding link to user profile
added styles.scss
fixed merge conflict
Merge pull request #19 from jvh1979theironyard/master

technique column  added to student table
database fixes and started workflow
Merge pull request #23 from slwaller/master

database fixes and started workflow