Some changes
Merge branch 'master' of https://github.com/hcuri/Team5
Merge branch 'master' of https://github.com/hcuri/Team5
Merge branch 'master' of https://github.com/hcuri/Team5
Merge branch 'master' of https://github.com/hcuri/Team5
Did some awesome css stuff