Merging with Jer
updated saving to database
Updated gitignore
ignoring shizz
Merge branch 'master' of C:/Users/Bradley/Dropbox/Git/euphrasia
testing database
Added save button and beginning listview on SearchActivity
Merging for db functionality
Updated index for website
fixed images in slide
Other small changes to about page
Added Brad picture
updating content provider
unsynced bin folder
Linked to voting page
blur slide
New Updates to Website for Youtube
Last Website Tweaks for v1.0
Merging with others
Merged conflict