changed the services to use the q and not just html, and made the entire app into one controller and one page