Merge branch 'master' into WillsBranch
Merge branch 'master' into WillsBranch
Merge branch 'master' into WillsBranch
Merge branch 'master' into WillsBranch
Merge branch 'master' into WillsBranch
Merge pull request #68 from milneti/master

pulling from master
Merge pull request #70 from milneti/master

Getting changes from master
Add placeholder functions for processing JSON data
more placeholder functions and bug fix
more placeholder functions
bug fix
Merge branch 'master' into WillsBranch
Merge branch 'master' into WillsBranch
Merge pull request #74 from milneti/master

Getting changes from master
note flagger
logout loop fixed
Made small change on Settings page
Sorting
transaction changes
+minor addition to transactions