use ENV['USERNAME'] as Username for database connection
use ENV['USERNAME'] || ENV['USER]
Merge branch 'ting_branch_2'
new Rakefile and config/database.rb with ENV['USERNAME'] and ENV['USER']
Merge branch 'master' of github.com:BioDigitalJazz/Ballotbox