test
Merge branch 'master' of https://github.com/mirco89/socialcomputing
Hi!

I am still making changes to the design.. but here is a rough copy. There is also an email id for recieving feedback for contact us page: socialcomputing1@gmail.com password:socialcomputing123

Also here u can see my dbname password and username.. figured it would be nice if in the end we can use the same db