First twitter bootstrap integration
Resolving conflict