index on master: 74e8a8a updating
WIP on master: 74e8a8a updating
Merge commit 'stash'
index on master: 95f3fb4 Merge commit 'stash'
WIP on master: 95f3fb4 Merge commit 'stash'
update
Merge commit 'stash'
Merge remote-tracking branch 'upstream/master'
lots of changes - lotto, views, user
Merge remote-tracking branch 'upstream/master'
Merge pull request #6 from Mallics/master

Yay!!