technique column  added to student table
Merge pull request #19 from jvh1979theironyard/master

technique column  added to student table
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team2
database fixes and started workflow
Merge pull request #23 from slwaller/master

database fixes and started workflow
fixed welcome.js.coffee file
Merge pull request #22 from ansleyjones/master

added styles.scss
merge error
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team2
login links and tree fix
Merge pull request #24 from slwaller/master

login links and tree fix
commit to pull
merge err
workflow states and databasefix
cleaned up views
Merge pull request #25 from slwaller/master

workflow states and databasefix
fixing merge
Merge pull request #27 from natalie03/master

cleaned up views - fixed merge
some styling
styled login page and main page