temp commit (for test deploy)
Modify hostname
Merge branch 'addModel'
Modify hostname
Add config.allow_insecure_token_lookup setting
Modify hostname
Add createVM, startVM, stopVM functions
Merge branch 'addModel'
Modify hostname
Merge remote-tracking branch 'heroku/master'

Conflicts:
	config/initializers/devise.rb
Merge branch 'master' into staging
Merge branch 'addModel' into staging
Merge branch 'master.backup'
Merge branch 'master.backup'
Merge branch 'master' into staging
Merge branch 'Issue#11'
Merge branch 'master' into staging
Merge branch 'master' into staging
Modify config/initializers/session_store.rb
temp