Committing before pulling
main activity calls jonathan's functions
remove code and change name
Merging with myself
removing warnings
Merge pull request #19 from SCS-hackers-group/annie

main activity calls jonathan's functions