Push before rails merge (working on formatting)