Start of redesign
fixed merge conflict
bit more style
middle row basic styled again
margins set
sorted top row THAT TOOK AGES!
style
Merge branch 'dashboard' into development
Dashboard functionality broken down into smaller parts for better design.
profile page updated style
login boxes in edit styled
Ready to merge in changes to dashboard and rewarding page
Edit profile updated
Merge branch 'dashboard' into development
reward page style, part 1
more reward page styling
rewarding page, more style
Profile logic updated
Merge branch 'back-end' into development
Some minor refactoring