updated views w/ 1
redoing bluemix
merging
updating server
merging
merging
merging
merging
merging
removing test