merge
Use twitter bootstrap
fixed conflict in merge
add Hash::Merge to cpanfile