initial front-end 11/22/13
first merge error