stuff

Added warning
Merge branch 'master' of https://github.com/cis422s14team5/WatchlistPro

Conflicts:
	.idea/workspace.xml
	out/artifacts/WatchlistPro_jar/WatchlistPro.jar
	out/production/WatchlistPro/WatchlistPro.class
	out/production/WatchlistPro/controller/Controller$1.class
	out/production/WatchlistPro/controller/Controller$2.class
	out/production/WatchlistPro/controller/Controller$3.class
	out/production/WatchlistPro/controller/Controller$4.class
	out/production/WatchlistPro/controller/Controller.class