initial commit
Initial commit
Merge branch 'master' of github.com:Sirenity/RailsTutorial
testing bootstrap gem
added import to scss
added bootstrap import to application coffee and scss
changed production configurations
Merge branch 'master' of github.com:Sirenity/Rails101_
merging things?
Conflicts:
	README.md