weekend meeting
merging log conflict problem
downloading bootstrap controller
Merge branch 'master' of https://github.com/Ogamedia/Rails_Overflow

Conflicts:
	log/development.log
pulling bootstrap inclusion
Merge branch 'master' of https://github.com/Ogamedia/Rails_Overflow
pulling problem
pulling problem
solutions controller pull
solutions controller pull