merge belindas awesome push
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team3
style views and template
added image to images dir
modals
pull upstream
pulled in log-in
messed with modals
merge
Merge pull request #27 from Mathdrquinn/master

Styling, let me know if you'd like to change