change Ruby SDK to ruby-2.0.0-p247 and exec `bundle install'
setup rspec and remove minitest support directories
Add User model and migration
use pry  as rails console
use pry  as rails console
add project model and migration
add Task model and migration
add TaskJournal model and migration
add Wiki model and migration
create join tables
fix typing error in Wiki model
update schema.rb
update schema.rb
Merge branch 'model_creation'

Conflicts:
	.idea/dataSources.ids
	.idea/dataSources.xml
	.idea/workspace.xml
fix workspace.xml conflict
setup bootstrap3, simple_form, datetimepicker, chosen-jquery
generate projects scaffold
setup devise
generate tasks scaffold
generate wikis scaffold