Merge branch 'master' of /Users/pierocappelleti/Documents/GitHub/ClassNoteTheOG/ClassNote with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Added a mock OverlayActivity
Added overlay activity and xml for it.