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
commit to pull
merge err
some styling
styled login page and main page
Merge pull request #29 from ansleyjones/master

styled login page and main.html