Simple signup twitter bootstrap added
conflicts in merge