merge conflicts
Merge branch 'master' of github.com:NicholasJay/cardMe
merge conflict style.css file
Merge branch 'master' of github.com:NicholasJay/cardMe
styling dashboard fixes
Merge pull request #43 from jsimon727/master

Dashboard Styling
Merge branch 'master' of github.com:NicholasJay/cardMe
merge fix