emergency status
Merge branch 'master' of github.com:vivenkat/FSEProjectOurs into localBranch

Conflicts:
	RESTBackend/src/main/java/edu/cmu/sv/ws/ssnoc/data/SQL.java
Merge pull request #14 from vivenkat/localBranch

Local branch