Committing before pulling
main activity calls jonathan's functions
remove code and change name
Merge pull request #20 from SCS-hackers-group/nico_branch

added blue line and black background to swiping tabs
Merging with myself
removing warnings
Merge pull request #19 from SCS-hackers-group/annie

main activity calls jonathan's functions
implemented the change page on tab click
resolved conflicts