Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team2
fixed welcome.js.coffee file
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
Merge pull request #29 from ansleyjones/master

styled login page and main.html
added form to create student
Merge pull request #30 from natalie03/master

added form to create student
?