Tasks basics done

The controller now allows for all of the basic things to do with tasks.
test
Added GIMP mockup for main page
Added OATH2 screenshots
Merge branch 'master' of https://github.com/Danation/GamifyTasks

Conflicts:
	views/demo.html
Add page mockup added

A mockup demonstrating adding both a task and a reward is added. THeMain
page also had an "add" button added beneath both the tasks and rewards
Added checkbox to rewards and deleted white space
Removed some white space
Landing page mockup added
Merge branch 'master' of https://github.com/Danation/GamifyTasks
Made login/signup button for landing page
Tweak buttons slightly
Added about page
Added OAuth basics
Creating a user model