added bootstrap
applied bootstrap
Merge branch 'develop' of github.com:vincentdyleung/webeng-2013-ex4 into develop

Conflicts:
	Gemfile.lock