overwriting master
Merge branch 'Christian'
Overwriting Tim 8-26-14
Merge branch 'Christian' into Tim
Redid the save to database feature, now the user clicks a button when there is a file loaded to save to their database
Added in show database button
Merge branch 'master' into Christian
Merge branch 'Tim' into Christian
Merge branch 'Test' into Christian